Finish v1.46.17(505)

Migliorie al loading popup durante il chiudi ordine in spedizione.

.idea/codeStyles/Project.xml

@@ -1,5 +1,40 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-03-17T09:16:48.549771200Z">
+        <DropdownSelection timestamp="2025-05-14T09:45:15.341614500Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=21088B8EFD" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=23324B682F" />
             </handle>
           </Target>
         </DropdownSelection>

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 493
+    def appVersionCode = 505
-    def appVersionName = '1.46.05'
+    def appVersionName = '1.46.17'
 
     signingConfigs {
         release {
@@ -101,7 +101,7 @@ configurations {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 //    androidTestImplementation('androidx.test.espresso:espresso-core:3.6.1', {
 //        exclude group: 'com.android.support', module: 'support-annotations'
@@ -112,11 +112,11 @@ dependencies {
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:33.9.0')
+    implementation platform('com.google.firebase:firebase-bom:33.13.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:18.5.0'
+    implementation 'com.google.android.gms:play-services-basement:18.7.0'
 
     //JJWT
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
@@ -128,7 +128,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.4.0'
 
@@ -142,7 +142,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.annimon:stream:1.2.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime:2.8.7'
+    implementation 'androidx.lifecycle:lifecycle-runtime:2.9.0'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
@@ -162,7 +162,7 @@ dependencies {
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
     //SQLite ROOM
-    def room_version = "2.6.1"
+    def room_version = "2.7.1"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"

app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java

@@ -313,8 +313,8 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    DocumentRESTConsumer provideDocumentiRESTConsumer(RESTBuilder restBuilder) {
+    DocumentRESTConsumer provideDocumentiRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
-        return new DocumentRESTConsumer(restBuilder);
+        return new DocumentRESTConsumer(restBuilder, executorService);
     }
 
     @Provides

app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java

@@ -97,6 +97,8 @@ public class MtbAart extends EntityBase {
 
     private List<MtbUntMis> mtbUntMis;
 
+    private List<MtbAartBarCode> mtbAartBarCode;
+
 
     public enum UntMisRifPesoEnum {
         C,
@@ -965,6 +967,13 @@ public class MtbAart extends EntityBase {
         return getMtbUntMis() != null && !getMtbUntMis().isEmpty() ? getMtbUntMis().get(0) : null;
     }
 
+    public List<MtbAartBarCode> getMtbAartBarCode() {
+        return mtbAartBarCode;
+    }
+
+    public void setMtbAartBarCode(List<MtbAartBarCode> mtbAartBarCode) {
+        this.mtbAartBarCode = mtbAartBarCode;
+    }
 
     @Override
     public boolean equals(Object o) {

app/src/main/java/it/integry/integrywmsnative/core/model/MtbAartBarCode.java

@@ -0,0 +1,55 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.math.BigDecimal;
+
+public class MtbAartBarCode extends EntityBase {
+    private String codBarre;
+    private String codMart;
+    private BigDecimal qtaCnf;
+    private String flagPrimario;
+    private String tipoCodBarre;
+
+    public MtbAartBarCode() {
+        this.type = "mtb_aart_bar_code";
+    }
+
+    public String getCodBarre() {
+        return codBarre;
+    }
+
+    public void setCodBarre(String codBarre) {
+        this.codBarre = codBarre;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public void setCodMart(String codMart) {
+        this.codMart = codMart;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public void setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+    }
+
+    public String getFlagPrimario() {
+        return flagPrimario;
+    }
+
+    public void setFlagPrimario(String flagPrimario) {
+        this.flagPrimario = flagPrimario;
+    }
+
+    public String getTipoCodBarre() {
+        return tipoCodBarre;
+    }
+
+    public void setTipoCodBarre(String tipoCodBarre) {
+        this.tipoCodBarre = tipoCodBarre;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/model/dto/AlreadyRegisteredUlDTO.java

@@ -3,7 +3,7 @@ package it.integry.integrywmsnative.core.model.dto;
 
 import it.integry.integrywmsnative.core.model.MtbColt;
 
-public class AlreadyRegisteredUDCDTO {
+public class AlreadyRegisteredUlDTO {
 
     private MtbColt mtbColt;
 
@@ -13,7 +13,7 @@ public class AlreadyRegisteredUDCDTO {
         return mtbColt;
     }
 
-    public AlreadyRegisteredUDCDTO setMtbColt(MtbColt mtbColt) {
+    public AlreadyRegisteredUlDTO setMtbColt(MtbColt mtbColt) {
         this.mtbColt = mtbColt;
         return this;
     }
@@ -22,7 +22,7 @@ public class AlreadyRegisteredUDCDTO {
         return canBeRecovered;
     }
 
-    public AlreadyRegisteredUDCDTO setCanBeRecovered(boolean canBeRecovered) {
+    public AlreadyRegisteredUlDTO setCanBeRecovered(boolean canBeRecovered) {
         this.canBeRecovered = canBeRecovered;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java

@@ -28,7 +28,7 @@ public class AuthInterceptor implements Interceptor {
     public Response intercept(@NonNull Chain chain) throws IOException {
         var originalRequest = chain.request();
 
-        if (SettingsManager.i().getUserSession() != null) {
+        if (SettingsManager.i().getUserSession() != null && SettingsManager.i().getUserSession().getAccessToken() != null) {
 
             var accessToken = SettingsManager.i().getUserSession().getAccessToken();
             var accessTokenExpiryDate = SettingsManager.i().getUserSession().getAccessTokenExpiryDate();
@@ -61,15 +61,16 @@ public class AuthInterceptor implements Interceptor {
                     return chain.proceed(originalRequest);
                 }
 
+                //Retrieve the new access token after refresh
+                accessToken = SettingsManager.i().getUserSession().getAccessToken();
+            }
 
-                // Add the access token to the request header
+            // Add the access token to the request header
-                var authorizedRequest = originalRequest.newBuilder()
+            var authorizedRequest = originalRequest.newBuilder()
-                        .header("Authorization", "Bearer " + SettingsManager.i().getUserSession().getAccessToken())
+                    .header("Authorization", "Bearer " + accessToken)
-                        .build();
+                    .build();
 
-                return chain.proceed(authorizedRequest);
+            return chain.proceed(authorizedRequest);
-            } else
-                return chain.proceed(originalRequest);
         } else
             return chain.proceed(originalRequest);
     }

app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java

@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.core.rest;
 import java.io.IOException;
 
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.Request;
@@ -31,18 +30,6 @@ public class HttpInterceptor implements Interceptor {
                 .addHeader("Accept", "*/*")
                 .addHeader("x-app-token", APP_TOKEN);
 
-
-        String accessToken = null;
-
-        //Nel caso in cui il token è scaduto e devo richiamare la refresh non bisogna passare il vecchio token
-        if(SettingsManager.i().getUserSession().getAccessTokenExpiryDate() != null &&
-                UtilityDate.getNowTime().isBefore(SettingsManager.i().getUserSession().getAccessTokenExpiryDate().minusSeconds(20))) {
-            accessToken = SettingsManager.i().getUserSession().getAccessToken();
-        }
-
-        if(accessToken != null)
-            builder.header("Authorization", "Bearer " + accessToken);
-
         var newRequest = builder
                 .url(url)
                 .build();

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.rest.consumers;
 import androidx.annotation.NonNull;
 
 import java.util.List;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
@@ -20,9 +21,11 @@ import retrofit2.Response;
 public class DocumentRESTConsumer extends _BaseRESTConsumer {
 
     private final RESTBuilder restBuilder;
+    private final ExecutorService executorService;
 
-    public DocumentRESTConsumer(RESTBuilder restBuilder) {
+    public DocumentRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) {
         this.restBuilder = restBuilder;
+        this.executorService = executorService;
     }
 
     public void createDocsFromColli(List<LoadColliDTO> listColli, RunnableArgs<List<DtbDoct>> onComplete, RunnableArgs<Exception> onFailed) {
@@ -40,17 +43,22 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void createDocFromColli(LoadColliDTO loadColliDTO, RunnableArgs<DtbDoct> onComplete, RunnableArgs<Exception> onFailed) {
+    public DtbDoct makeSynchronousCreateDocFromColliRequest(LoadColliDTO loadColliDTO) throws Exception {
         DocumentiRESTConsumerService documentiRESTConsumerService = restBuilder.getService(DocumentiRESTConsumerService.class);
-        documentiRESTConsumerService.createDocFromColli(loadColliDTO).enqueue(new ManagedErrorCallback<>() {
+        var response = documentiRESTConsumerService
-            @Override
+                .createDocFromColli(loadColliDTO)
-            public void onResponse(Call<ServiceRESTResponse<DtbDoct>> call, Response<ServiceRESTResponse<DtbDoct>> response) {
+                .execute();
-                analyzeAnswer(response, "createDocFromColli", onComplete, onFailed);
-            }
 
-            @Override
+        return analyzeAnswer(response, "createDocFromColli");
-            public void onFailure(Call<ServiceRESTResponse<DtbDoct>> call, @NonNull final Exception e) {
+    }
-                onFailed.run(e);
+
+    public void makeCreateDocFromColliRequest(LoadColliDTO loadColliDTO, RunnableArgs<DtbDoct> onComplete, RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var result = makeSynchronousCreateDocFromColliRequest(loadColliDTO);
+                if (onComplete != null) onComplete.run(result);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
             }
         });
     }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java

@@ -4,11 +4,8 @@ import androidx.annotation.NonNull;
 
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
-import com.google.gson.reflect.TypeToken;
 
-import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
@@ -21,6 +18,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
@@ -28,8 +26,7 @@ import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
+import it.integry.integrywmsnative.core.rest.model.uds.RetrieveAlreadyRegisteredUdsRequestDTO;
-import it.integry.integrywmsnative.core.utility.UtilityQuery;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import retrofit2.Call;
@@ -180,44 +177,27 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
-    public void getBancaliGiaRegistrati(List<OrdineInevasoDTO> orders, GestioneEnum gestione, int segno, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
+    public List<AlreadyRegisteredUlDTO> getBancaliGiaRegistratiSynchronized(List<? extends OrdineInevasoDTO> orders, int segno) throws Exception {
-        String whereCondGestione = "";
+        OrdiniRESTConsumerService service = restBuilder.getService(OrdiniRESTConsumerService.class);
 
-        if (gestione != null) {
+        var request = new RetrieveAlreadyRegisteredUdsRequestDTO()
-            whereCondGestione = "mtb_colt.gestione = " + UtilityDB.valueToString(gestione.getText()) + " ";
+                .setOrdini(orders)
-        } else {
+                .setSegno(segno);
-            whereCondGestione = "(mtb_colt.gestione = 'V' OR mtb_colt.gestione = 'L') ";
-        }
 
-        String baseSql = "SELECT DISTINCT mtb_colt.* " +
+        var response = service.retrieveAlreadyRegisteredUDS(request)
-                "FROM mtb_colt " +
+                .execute();
-                "       INNER JOIN mtb_colr ON " +
+        var data = analyzeAnswer(response, "getBancaliGiaRegistrati");
-                "       mtb_colt.gestione = mtb_colr.gestione " +
+        return data == null || data.getUdsList() == null ? new ArrayList<>() : data.getUdsList();
-                "        AND mtb_colt.ser_collo = mtb_colr.ser_collo " +
+    }
-                "        AND mtb_colt.data_collo = mtb_colr.data_collo " +
-                "        AND mtb_colt.num_collo = mtb_colr.num_collo " +
-                " WHERE " + whereCondGestione +
-                "  AND mtb_colt.segno = " + UtilityDB.valueToString(segno) + " " +
-                "  AND mtb_colt.data_doc IS NULL AND ";
 
-        List<HashMap<String, Object>> whereCondMapList = new ArrayList<>();
+    public void getBancaliGiaRegistrati(List<OrdineInevasoDTO> orders, int segno, RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        for (OrdineInevasoDTO ordineInevaso : orders) {
+        executorService.execute(() -> {
-            HashMap<String, Object> whereCondMap = new HashMap<>();
+            try {
-            whereCondMap.put("mtb_colr.data_ord", ordineInevaso.getDataOrdD());
+                var result = getBancaliGiaRegistratiSynchronized(orders, segno);
-            whereCondMap.put("mtb_colr.num_ord", ordineInevaso.getNumOrd());
+                if (onComplete != null) onComplete.run(result);
-            whereCondMap.put("mtb_colr.gestione", ordineInevaso.getGestione());
+            } catch (Exception ex) {
-
+                if (onFailed != null) onFailed.run(ex);
-            whereCondMapList.add(whereCondMap);
+            }
-        }
-
-        baseSql += "(" + UtilityQuery.concatFieldListInWhereCond(whereCondMapList) + ")";
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {
-        }.getType();
-        this.mSystemRESTConsumer.<List<MtbColt>>processSql(baseSql, typeOfObjectsList, value -> {
-            if (onComplete != null) onComplete.run(value);
-        }, ex -> {
-            if (onFailed != null) onFailed.run(ex);
         });
     }
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java

@@ -5,6 +5,8 @@ import java.util.List;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.RetrieveAlreadyRegisteredUdsRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.uds.RetrieveAlreadyRegisteredUdsResponseDTO;
 import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO;
 import it.integry.integrywmsnative.core.rest.model.GetPickingListDTO;
 import retrofit2.Call;
@@ -23,4 +25,7 @@ public interface OrdiniRESTConsumerService {
 
     @GET("SM2GetOrdiniVenditaInevasi")
     Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> getOrdiniInevasi(@Query("codMdep") String codMdep, @Query("gestione") String gestione);
+
+    @POST("wms/spedizione/retrieveAlreadyRegisteredUDS")
+    Call<ServiceRESTResponse<RetrieveAlreadyRegisteredUdsResponseDTO>> retrieveAlreadyRegisteredUDS(@Body RetrieveAlreadyRegisteredUdsRequestDTO request);
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java

@@ -125,13 +125,12 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
 
     public void printClosedOrdersSynchronized(PrintOrderCloseDTO dto, String codMdep) throws Exception {
         if (BuildConfig.DEBUG) {
-            return;
+//            return;
         }
 
         PrinterRESTConsumerService printerService = restBuilder.getService(PrinterRESTConsumerService.class, 240);
-        Call<ServiceRESTResponse<Object>> callable = printerService.printClosedOrders(codMdep, dto);
 
-        var response = callable.execute();
+        var response = printerService.printClosedOrders(codMdep, dto).execute();
         analyzeAnswer(response, "printCollo");
     }
 

app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/RetrieveAlreadyRegisteredUdsRequestDTO.java

@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+
+public class RetrieveAlreadyRegisteredUdsRequestDTO {
+
+    private List<? extends OrdineInevasoDTO> ordini;
+    private int segno;
+
+    public List<? extends OrdineInevasoDTO> getOrdini() {
+        return ordini;
+    }
+
+    public RetrieveAlreadyRegisteredUdsRequestDTO setOrdini(List<? extends OrdineInevasoDTO> ordini) {
+        this.ordini = ordini;
+        return this;
+    }
+
+    public int getSegno() {
+        return segno;
+    }
+
+    public RetrieveAlreadyRegisteredUdsRequestDTO setSegno(int segno) {
+        this.segno = segno;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/uds/RetrieveAlreadyRegisteredUdsResponseDTO.java

@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.rest.model.uds;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
+
+public class RetrieveAlreadyRegisteredUdsResponseDTO {
+
+    private List<AlreadyRegisteredUlDTO> udsList;
+
+    public List<AlreadyRegisteredUlDTO> getUdsList() {
+        return udsList;
+    }
+
+    public RetrieveAlreadyRegisteredUdsResponseDTO setUdsList(List<AlreadyRegisteredUlDTO> udsList) {
+        this.udsList = udsList;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java

@@ -97,6 +97,7 @@ public class DBSettingsModel {
     private List<String> allowedCodMgrpForArtCreation;
     private boolean flagAccettazioneGroupListForn = false;
     private boolean flagSpedizioneEnableFastPicking = false;
+    private boolean flagAccettazioneBollaEditableQtaTot = true;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -815,4 +816,12 @@ public class DBSettingsModel {
     public void setFlagSpedizioneEnableFastPicking(boolean flagSpedizioneEnableFastPicking) {
         this.flagSpedizioneEnableFastPicking = flagSpedizioneEnableFastPicking;
     }
+
+    public boolean isFlagAccettazioneBollaEditableQtaTot() {
+        return flagAccettazioneBollaEditableQtaTot;
+    }
+
+    public void setFlagAccettazioneBollaEditableQtaTot(boolean flagAccettazioneBollaEditableQtaTot) {
+        this.flagAccettazioneBollaEditableQtaTot = flagAccettazioneBollaEditableQtaTot;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java

@@ -564,6 +564,12 @@ public class SettingsManager {
                 .setKeySection("ENABLE_FAST_PICKING")
                 .setSetter(dbSettingsModelIstance::setFlagSpedizioneEnableFastPicking)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("ACCETTAZIONE_BOLLA")
+                .setKeySection("FLAG_QTA_TOT_EDITABLE")
+                .setSetter(dbSettingsModelIstance::setFlagAccettazioneBollaEditableQtaTot)
+                .setDefaultValue(true));
 
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_elenco/rest/BolleAccettazioneRESTConsumer.java

@@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.accettazione_bolla_elenco.rest;
 
 import androidx.annotation.NonNull;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Singleton;
@@ -54,7 +55,7 @@ public class BolleAccettazioneRESTConsumer extends _BaseRESTConsumer {
                 .enqueue(new ManagedErrorCallback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<RetrieveElencoArticoliAccettazioneBollaResponseDTO>> call, Response<ServiceRESTResponse<RetrieveElencoArticoliAccettazioneBollaResponseDTO>> response) {
-                        analyzeAnswer(response, "retrievePickingListBolle", data -> onComplete.run(data.getSitArticoli()), onFailed);
+                        analyzeAnswer(response, "retrievePickingListBolle", data -> onComplete.run(data.getSitArticoli() == null ? new ArrayList<>() : data.getSitArticoli()), onFailed);
                     }
 
                     @Override

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java

@@ -42,7 +42,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
@@ -452,12 +452,12 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
         dialog.show();
     }
 
-    public void startListaBancaliRegistratiActivity(List<AlreadyRegisteredUDCDTO> mtbColts) {
+    public void startListaBancaliRegistratiActivity(List<AlreadyRegisteredUlDTO> mtbColts) {
 
         Intent myIntent = ListaBancaliActivity.createIntent(this,
 
                 Stream.of(mtbColts)
-                        .map(AlreadyRegisteredUDCDTO::getMtbColt)
+                        .map(AlreadyRegisteredUlDTO::getMtbColt)
                         .toList(),
 
                 input -> Stream.of(mtbColts)
@@ -620,6 +620,7 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac
                 .setDataScad(dataScad)
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setCanLUBeClosed(true)
+                .setQtaTotEditable(SettingsManager.iDB().isFlagAccettazioneBollaEditableQtaTot())
                 .setCanOverflowOrderQuantity(canOverflowQuantity)
                 .setDisableTracciabilitaCheck(SettingsManager.iDB().isFlagAccettazioneBollaDisableMandatoryTracciabilita());
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingViewModel.java

@@ -30,7 +30,7 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
@@ -160,7 +160,7 @@ public class AccettazioneBollaPickingViewModel {
     }
 
 
-    public void retrieveExistentLU(RunnableArgs<List<AlreadyRegisteredUDCDTO>> onComplete) {
+    public void retrieveExistentLU(RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete) {
         this.sendOnLoadingStarted();
 
         this.mAccettazioneBollaPickingRESTConsumer.retrieveAlreadyRegisteredUDC(this.mBolle, mtbColtList -> {

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/dto/RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO.java

@@ -2,17 +2,17 @@ package it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 
 public class RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO {
 
-    private List<AlreadyRegisteredUDCDTO> udcList;
+    private List<AlreadyRegisteredUlDTO> udcList;
 
-    public List<AlreadyRegisteredUDCDTO> getUdcList() {
+    public List<AlreadyRegisteredUlDTO> getUdcList() {
         return udcList;
     }
 
-    public RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO setUdcList(List<AlreadyRegisteredUDCDTO> udcList) {
+    public RetrieveAlreadyRegisteredULAccettazioneBollaResponseDTO setUdcList(List<AlreadyRegisteredUlDTO> udcList) {
         this.udcList = udcList;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/rest/AccettazioneBollaPickingRESTConsumer.java

@@ -9,7 +9,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
 import it.integry.integrywmsnative.core.rest.handler.ManagedErrorCallback;
@@ -32,7 +32,7 @@ public class AccettazioneBollaPickingRESTConsumer extends _BaseRESTConsumer {
     }
 
 
-    public void retrieveAlreadyRegisteredUDC(List<TestataBollaAccettazioneDTO> bolle, RunnableArgs<List<AlreadyRegisteredUDCDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void retrieveAlreadyRegisteredUDC(List<TestataBollaAccettazioneDTO> bolle, RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         AccettazioneBollaPickingRESTConsumerService service = restBuilder.getService(AccettazioneBollaPickingRESTConsumerService.class);
 
         var request = new RetrieveAlreadyRegisteredULAccettazioneBollaRequestDTO()

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java

@@ -45,7 +45,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
@@ -690,11 +690,11 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         dialog.show();
     }
 
-    public void startListaBancaliRegistratiActivity(List<AlreadyRegisteredUDCDTO> mtbColts) {
+    public void startListaBancaliRegistratiActivity(List<AlreadyRegisteredUlDTO> mtbColts) {
 
         Intent myIntent = ListaBancaliActivity.createIntent(this,
 
-                Stream.of(mtbColts).map(AlreadyRegisteredUDCDTO::getMtbColt).toList(),
+                Stream.of(mtbColts).map(AlreadyRegisteredUlDTO::getMtbColt).toList(),
 
                 input -> Stream.of(mtbColts).filter(x -> x.getMtbColt() == input).findFirstOrElse(null).isCanBeRecovered(),
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingViewModel.java

@@ -32,7 +32,7 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
@@ -198,7 +198,7 @@ public class AccettazioneOrdiniPickingViewModel {
         return mPickingList;
     }
 
-    public void retrieveExistentLU(RunnableArgs<List<AlreadyRegisteredUDCDTO>> onComplete) {
+    public void retrieveExistentLU(RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete) {
         this.sendOnLoadingStarted();
 
         this.mAccettazioneOrdiniPickingRESTConsumer.getBancaliGiaRegistrati(this.mOrders, mtbColtList -> {

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/dto/RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO.java

@@ -2,17 +2,17 @@ package it.integry.integrywmsnative.gest.accettazione_ordini_picking.dto;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 
 public class RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO {
 
-    private List<AlreadyRegisteredUDCDTO> udcList;
+    private List<AlreadyRegisteredUlDTO> udcList;
 
-    public List<AlreadyRegisteredUDCDTO> getUdcList() {
+    public List<AlreadyRegisteredUlDTO> getUdcList() {
         return udcList;
     }
 
-    public RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO setUdcList(List<AlreadyRegisteredUDCDTO> udcList) {
+    public RetrieveAlreadyRegisteredULAccettazioneOrdineResponseDTO setUdcList(List<AlreadyRegisteredUlDTO> udcList) {
         this.udcList = udcList;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/rest/AccettazioneOrdiniPickingRESTConsumer.java

@@ -9,7 +9,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUDCDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
@@ -33,7 +33,7 @@ public class AccettazioneOrdiniPickingRESTConsumer extends _BaseRESTConsumer {
         this.systemRestConsumer = systemRESTConsumer;
     }
 
-    public void getBancaliGiaRegistrati(List<OrdineAccettazioneInevasoDTO> ordiniToShow, RunnableArgs<List<AlreadyRegisteredUDCDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void getBancaliGiaRegistrati(List<OrdineAccettazioneInevasoDTO> ordiniToShow, RunnableArgs<List<AlreadyRegisteredUlDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         AccettazioneOrdiniPickingRESTConsumerService service = restBuilder.getService(AccettazioneOrdiniPickingRESTConsumerService.class);
 
         var request = new RetrieveAlreadyRegisteredULAccettazioneOrdineRequestDTO()

app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java

@@ -50,7 +50,7 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
     public final ObservableField<MtbColt> mtbColt = new ObservableField<>();
     public final ObservableField<String> descrizioneDepo = new ObservableField<>();
     public ObservableField<Boolean> fabVisible = new ObservableField<>(true);
-    public ObservableField<Boolean> recoverFabMenuVisible = new ObservableField<>(false);
+    public Boolean recoverFabMenuVisible = false;
     private PopupMenu fabPopupMenu;
 
     private String mReportName;
@@ -80,7 +80,7 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        boolean canRecoverUL = DataCache.retrieveItem(getIntent().getStringExtra(Key.CanRecoverUL));
+        recoverFabMenuVisible = DataCache.retrieveItem(getIntent().getStringExtra(Key.CanRecoverUL));
         mtbColt.set(DataCache.retrieveItem(getIntent().getStringExtra(Key.MtbColtKey)));
         mReportName = DataCache.retrieveItem(getIntent().getStringExtra(Key.ReportName));
 
@@ -102,8 +102,6 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
         mViewModel.setListener(this);
         mViewModel.init(mtbColt.get(), mReportName);
 
-        recoverFabMenuVisible.set(canRecoverUL);
-
         this.initRecyclerView();
         this.initColloInfo();
         this.initFab();
@@ -144,6 +142,10 @@ public class ContenutoBancaleActivity extends BaseActivity implements ContenutoB
             fabPopupMenu.getMenu().removeItem(R.id.delete_ul);
         }
 
+        if(!recoverFabMenuVisible) {
+            fabPopupMenu.getMenu().removeItem(R.id.recover_ul);
+        }
+
         fabPopupMenu.setOnMenuItemClickListener(item -> {
             int itemId = item.getItemId();
 

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java

@@ -43,10 +43,10 @@ import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.model.JtbComt;
 import it.integry.integrywmsnative.core.model.MtbColr;
-import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepo;
 import it.integry.integrywmsnative.core.model.MtbGrup;
 import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
@@ -806,7 +806,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     @Override
     public void onResume() {
         super.onResume();
-        Stream.of(this.mOrdiniInevasiMutableData)
+        this.mOrdiniInevasiMutableData.stream()
                 .forEach(x -> x.getSelectedObservable().set(false));
     }
 
@@ -842,7 +842,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     }
 
     @Override
-    public void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<MtbColt> alreadyRegisteredMtbColts) {
+    public void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<AlreadyRegisteredUlDTO> alreadyRegisteredMtbColts) {
         List<String> codMarts = Stream.of(sitArts)
                 .distinctBy(SitArtOrdDTO::getCodMart)
                 .map(SitArtOrdDTO::getCodMart)
@@ -862,7 +862,6 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
                 () -> SpedizioneActivity.startActivity(getActivity(),
                         sitArts,
                         orders,
-                        alreadyRegisteredMtbColts,
                         mCurrentGestioneCol,
                         mCurrentSegnoCol,
                         MtbColr.Causale.DEFAULT,

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java

@@ -23,9 +23,9 @@ import it.integry.integrywmsnative.core.exception.NoOrderFoundException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.DtbOrdt;
-import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbGrup;
 import it.integry.integrywmsnative.core.model.OrdineInevasoDTO;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
@@ -146,8 +146,7 @@ public class OrdiniUscitaElencoViewModel {
             List<SitArtOrdDTO> finalSitArts = sitArts;
 
             this.mOrdiniRESTConsumer.getBancaliGiaRegistrati(
-                    Stream.of(selectedOrdersBase).map(x -> (OrdineInevasoDTO) x).toList(),
+                    selectedOrdersBase.stream().map(x -> (OrdineInevasoDTO) x).collect(Collectors.toList()),
-                    mCurrentGestioneCol,
                     mCurrentSegnoCol,
                     mtbColtList -> {
                         this.sendOnOrdersDispatched(selectedOrdersBase, finalSitArts, mtbColtList);
@@ -303,7 +302,7 @@ public class OrdiniUscitaElencoViewModel {
         if (this.mListener != null) mListener.onOrderFiltered(filteredOrders);
     }
 
-    private void sendOnOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<MtbColt> alreadyRegisteredMtbColts) {
+    private void sendOnOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<AlreadyRegisteredUlDTO> alreadyRegisteredMtbColts) {
         if (this.mListener != null)
             mListener.onOrdersDispatched(orders, sitArts, alreadyRegisteredMtbColts);
     }
@@ -316,7 +315,7 @@ public class OrdiniUscitaElencoViewModel {
 
         void onOrderFiltered(List<OrdiniUscitaElencoDTO> filteredOrders);
 
-        void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<MtbColt> alreadyRegisteredMtbColts);
+        void onOrdersDispatched(List<OrdineUscitaInevasoDTO> orders, List<SitArtOrdDTO> sitArts, List<AlreadyRegisteredUlDTO> alreadyRegisteredMtbColts);
     }
 
 }

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

@@ -338,6 +338,8 @@ public class PickingLiberoViewModel {
 
         if (this.mFlagAskCliente) {
             var data = this.sendLUClienteRequired();
+            if (data == null) return;
+
             vtbDest = data.first;
             codJcom = data.second;
         }
@@ -648,7 +650,6 @@ public class PickingLiberoViewModel {
     }
 
 
-
     private void executeDepositChangeIfNeeded(MtbColt refMtbColt) throws Exception {
         //Considero solo la prima UDC scansionata
         boolean shouldChangeCodMdep = refMtbColt != null && !refMtbColt.getCodMdep().equalsIgnoreCase(mCurrentMtbColt.getCodMdep()) &&
@@ -860,7 +861,7 @@ public class PickingLiberoViewModel {
 
             if (this.mDefaultGestione == GestioneEnum.LAVORAZIONE && SettingsManager.iDB().isProduzioneGeneraDocScar()) {
 
-                if(SettingsManager.iDB().getInternalCodAnags() == null || SettingsManager.iDB().getInternalCodAnags().isEmpty())
+                if (SettingsManager.iDB().getInternalCodAnags() == null || SettingsManager.iDB().getInternalCodAnags().isEmpty())
                     throw new Exception("Nessuna anagrafica aziendale configurata. Assicurarsi di aver abilitato il flag FLAG_USE_COD_ANAG_AZIENDALE.");
 
                 closeUDSRequest

app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java

@@ -446,7 +446,6 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
         SpedizioneActivity.startActivity(getActivity(),
                 sitArtOrdDTOS,
                 new ArrayList<>(),
-                new ArrayList<>(),
                 GestioneEnum.LAVORAZIONE,
                 +1,
                 MtbColr.Causale.VERSAMENTO,

app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java

@@ -201,6 +201,8 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
         barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessful(onScanSuccessful)
                 .setOnScanFailed(ex -> UtilityExceptions.defaultException(requireContext(), ex, false)));
+
+        BarcodeManager.enable(barcodeScannerIstanceID);
     }
 
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
@@ -209,12 +211,12 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
         executorService.execute(() -> {
             try {
                 this.mViewModel.processBarcodeDTO(data);
-                this.onLoadingEnded();
             } catch (Exception e) {
                 this.onError(e);
             }
         });
 
+        this.onLoadingEnded();
     };
 
 
@@ -279,6 +281,8 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
                 .setTotalNumCnfOrd(incomingNumCnf)
                 .setPartitaMag(partitaMag)
                 .setDataScad(dataScad)
+                .setCanInputZeroQuantity(true)
+                .setCanOverflowOrderQuantity(true)
                 .setCanLUBeClosed(false);
 
         if (!dialogInputQuantityV2View.isVisible())

app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java

@@ -11,6 +11,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
@@ -24,6 +25,7 @@ import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGi
 import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper;
 import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbAartBarCode;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
@@ -116,7 +118,7 @@ public class VerificaGiacenzeViewModel {
 
     public void randomizeElements(int elementsCount) {
 
-        for(int i = 0; i < elementsCount; i++) {
+        for (int i = 0; i < elementsCount; i++) {
             var randomIndex = (int) (Math.random() * currentLoadedAnagrafiche.size());
             var randomAnagrafica = currentLoadedAnagrafiche.get(randomIndex);
 
@@ -168,7 +170,7 @@ public class VerificaGiacenzeViewModel {
 
 
     public void save() throws Exception {
-        if(currentVerificaRows.getValue().isEmpty()) {
+        if (currentVerificaRows.getValue().isEmpty()) {
             delete();
             return;
         }
@@ -280,10 +282,21 @@ public class VerificaGiacenzeViewModel {
     }
 
     public MtbAart searchAnagraficaByBarcode(String barcode) {
-        return currentLoadedAnagrafiche.parallelStream()
+        MtbAart mtbAart = currentLoadedAnagrafiche.parallelStream()
-                .filter(mtbAart -> barcode.equals(mtbAart.getBarCode()))
+                .filter(x -> barcode.equals(x.getBarCode()))
                 .findFirst()
                 .orElse(null);
+
+        if (mtbAart == null) {
+            mtbAart = currentLoadedAnagrafiche.parallelStream()
+                    .filter(x -> x.getMtbAartBarCode() != null &&
+                            x.getMtbAartBarCode().stream()
+                                    .anyMatch(y -> barcode.equals(y.getCodBarre())))
+                    .findFirst()
+                    .orElse(null);
+        }
+
+        return mtbAart;
     }
 
     public void insertRow(VerificaGiacenzeRowEntity rowEntity) {

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

@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
@@ -50,8 +51,10 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.core.report.ReportManager;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
@@ -120,7 +123,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     private ArrayList<SitArtOrdDTO> mSitArtOrd;
     private ArrayList<OrdineUscitaInevasoDTO> mTestateOrdini;
-    private ArrayList<MtbColt> mColliRegistrati;
+    private ArrayList<AlreadyRegisteredUlDTO> mColliRegistrati;
     private GestioneEnum mGestioneCol;
     private int mSegnoCol;
     private Integer mDefaultCausaleUL;
@@ -135,7 +138,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     public static void startActivity(Context context,
                                      List<SitArtOrdDTO> ordini,
                                      List<OrdineUscitaInevasoDTO> selectedOrders,
-                                     List<MtbColt> mtbColtList,
                                      GestioneEnum gestioneCol,
                                      int segnoCol,
                                      Integer defaultCausaleUL,
@@ -149,9 +151,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         String keyTestateOrdini = DataCache.addItem(selectedOrders);
         myIntent.putExtra("keyTestateOrdini", keyTestateOrdini);
 
-        String keyColliRegistrati = DataCache.addItem(mtbColtList);
-        myIntent.putExtra("keyColliRegistrati", keyColliRegistrati);
-
         String keyGestioneCol = DataCache.addItem(gestioneCol);
         myIntent.putExtra("keyGestioneCol", keyGestioneCol);
 
@@ -176,7 +175,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
         mSitArtOrd = DataCache.retrieveItem(getIntent().getStringExtra("keyPickingList"));
         mTestateOrdini = DataCache.retrieveItem(getIntent().getStringExtra("keyTestateOrdini"));
-        mColliRegistrati = DataCache.retrieveItem(getIntent().getStringExtra("keyColliRegistrati"));
         mGestioneCol = DataCache.retrieveItem(getIntent().getStringExtra("keyGestioneCol"));
         mSegnoCol = DataCache.retrieveItem(getIntent().getStringExtra("keySegnoCol"));
         mDefaultCausaleUL = DataCache.retrieveItem(getIntent().getStringExtra("keyDefaultCausaleCol"));
@@ -229,7 +227,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 canOverflowOrderQuantity,
                 mSitArtOrd,
                 mTestateOrdini,
-                mColliRegistrati,
                 mGestioneCol, mSegnoCol, mDefaultCausaleUL,
                 mEnableQuantityReset,
                 useQtaOrd,
@@ -822,25 +819,45 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     }
 
     public void showCreatedUL() {
-        handler.post(() -> {
+        this.fabPopupMenu.dismiss();
-            this.fabPopupMenu.dismiss();
 
-            ArrayList<MtbColt> createdMtbColts = this.mViewmodel.getCreatedMtbColts();
+        executorService.execute(() -> {
+            try {
+                ArrayList<AlreadyRegisteredUlDTO> createdMtbColts = this.mViewmodel.getCreatedMtbColts();
 
-            Intent myIntent = ListaBancaliActivity.createIntent(this, createdMtbColts, true, false);
+                handler.post(() -> {
-            this.startActivityForResult(myIntent, PICK_UL_REQUEST);
+                    Intent myIntent = ListaBancaliActivity.createIntent(this,
+
+                            createdMtbColts.stream()
+                                    .map(AlreadyRegisteredUlDTO::getMtbColt)
+                                    .collect(Collectors.toList()),
+
+                            input -> createdMtbColts.stream()
+                                    .filter(x -> x.getMtbColt().equals(input))
+                                    .findFirst()
+                                    .map(AlreadyRegisteredUlDTO::isCanBeRecovered)
+                                    .orElse(false),
+
+                            false,
+
+                            ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
+
+
+                    this.startActivityForResult(myIntent, PICK_UL_REQUEST);
+                });
+            } catch (Exception e) {
+                onError(e);
+            }
         });
     }
 
 
     public void closeOrder() {
         this.fabPopupMenu.dismiss();
-        this.onLoadingStarted();
 
         executorService.execute(() -> {
             try {
                 this.mViewmodel.closeOrder();
-                this.onLoadingEnded();
             } catch (Exception e) {
                 onError(e);
             }

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

@@ -50,6 +50,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.MtbPartitaMag;
 import it.integry.integrywmsnative.core.model.VtbVett;
+import it.integry.integrywmsnative.core.model.dto.AlreadyRegisteredUlDTO;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
 import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol;
@@ -107,7 +108,6 @@ public class SpedizioneViewModel {
 
     private List<OrdineUscitaInevasoDTO> mTestateOrdini;
     private MutableLiveData<List<PickingObjectDTO>> mPickingList = new MutableLiveData<>();
-    private List<MtbColt> mColliRegistrati = new ArrayList<>();
     private List<MtbPartitaMag> mPartitaMagList = new ArrayList<>();
 
     private Listener mListener;
@@ -187,12 +187,11 @@ public class SpedizioneViewModel {
     }
 
 
-    public void init(String codMdep, boolean enableGiacenza, boolean enableCheckPartitaMag, boolean shouldAskPesoLU, boolean canOverflowOrderQuantity, List<SitArtOrdDTO> pickingList, List<OrdineUscitaInevasoDTO> testateOrdini, List<MtbColt> colliRegistrati, GestioneEnum gestioneCol, int segnoCol, Integer defaultCausaleUL, boolean enableQuantityReset, boolean useQtaOrd, boolean useColliPedana) {
+    public void init(String codMdep, boolean enableGiacenza, boolean enableCheckPartitaMag, boolean shouldAskPesoLU, boolean canOverflowOrderQuantity, List<SitArtOrdDTO> pickingList, List<OrdineUscitaInevasoDTO> testateOrdini, GestioneEnum gestioneCol, int segnoCol, Integer defaultCausaleUL, boolean enableQuantityReset, boolean useQtaOrd, boolean useColliPedana) {
         this.sendOnLoadingStarted();
 
         this.mDefaultCodMdep = codMdep;
         this.mTestateOrdini = testateOrdini;
-        this.mColliRegistrati = colliRegistrati;
         this.mEnableGiacenza = enableGiacenza;
         this.mEnableCheckPartitaMag = enableCheckPartitaMag;
         this.mCanOverflowOrderQuantity = canOverflowOrderQuantity;
@@ -342,14 +341,6 @@ public class SpedizioneViewModel {
         return mIsOrdTrasf;
     }
 
-    private void onOrderClosedPrintingDone() {
-        if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) {
-            this.sendCreateDocsRequest();
-        } else {
-            this.sendOnOrderClosed();
-        }
-
-    }
 
     private void sendOnLoadingStarted() {
         if (this.mListener != null) mListener.onLoadingStarted();
@@ -515,7 +506,6 @@ public class SpedizioneViewModel {
     }
 
     private Pair<Boolean, MtbDepoPosizione> sendLUPositionChangeRequest() {
-
         final CountDownLatch latch = new CountDownLatch(1);
         AtomicReference<Pair<Boolean, MtbDepoPosizione>> result = new AtomicReference<>();
 
@@ -533,9 +523,22 @@ public class SpedizioneViewModel {
         return null;
     }
 
-    private void sendBatchLotSelectionRequest(List<MtbPartitaMag> availableBatchLots, RunnableArgs<MtbPartitaMag> onComplete) {
+    private MtbPartitaMag sendBatchLotSelectionRequest(List<MtbPartitaMag> availableBatchLots) {
-        if (this.mListener != null)
+        final CountDownLatch latch = new CountDownLatch(1);
-            mListener.onBatchLotSelectionRequest(availableBatchLots, onComplete);
+        AtomicReference<MtbPartitaMag> result = new AtomicReference<>();
+
+        mListener.onBatchLotSelectionRequest(availableBatchLots, item -> {
+            result.set(item);
+            latch.countDown();
+        });
+
+        try {
+            latch.await(); // Attende che il dialog venga chiuso
+            return result.get();
+        } catch (InterruptedException e) {
+            this.sendError(e);
+        }
+        return null;
     }
 
     public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO) throws Exception {
@@ -1016,24 +1019,23 @@ public class SpedizioneViewModel {
                             .collect(Collectors.toList()));
                 }
 
-                this.sendBatchLotSelectionRequest(tmp, selected -> {
+                var selected = this.sendBatchLotSelectionRequest(tmp);
-                    this.sendOnLoadingEnded();
+                this.sendOnLoadingEnded();
 
-                    if (selected != null) {
+                if (selected != null) {
-                        MtbColr scannedMtbColr = pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().stream()
+                    MtbColr scannedMtbColr = pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().stream()
-                                .filter(x -> x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) &&
+                            .filter(x -> x.getCodMart().equalsIgnoreCase(pickingObjectDTO.getMtbAart().getCodMart()) &&
-                                        ((x.getPartitaMag() != null && selected.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(selected.getPartitaMag()))
+                                    ((x.getPartitaMag() != null && selected.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(selected.getPartitaMag()))
-                                                || (x.getPartitaMag() == null && selected.getPartitaMag() == null)))
+                                            || (x.getPartitaMag() == null && selected.getPartitaMag() == null)))
-                                .findFirst()
+                            .findFirst()
-                                .orElse(null);
+                            .orElse(null);
 
-                        try {
+                    try {
-                            dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColr, canPartitaMagBeChanged, executeImmediately);
+                        dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColr, canPartitaMagBeChanged, executeImmediately);
-                        } catch (Exception e) {
+                    } catch (Exception e) {
-                            this.sendError(e);
+                        this.sendError(e);
-                        }
                     }
-                });
+                }
 
             } else {
                 dispatchOrdineRowOnPostBatchLotSelection(pickingObjectDTO, refMtbColt, refMtbColr, scannedMtbColrs.get(0), canPartitaMagBeChanged, executeImmediately);
@@ -1734,13 +1736,8 @@ public class SpedizioneViewModel {
 
             var positionedMtbColts = this.askPositionChange(filledMtbColts);
 
-
             this.askPrint((shouldPrint && SettingsManager.iDB().isFlagPrintEtichetteOnLUClose()), positionedMtbColts);
 
-            positionedMtbColts.stream()
-                    .filter(x -> !this.mColliRegistrati.contains(x))
-                    .forEach(x -> this.mColliRegistrati.add(x));
-
             postCloseOperations(positionedMtbColts);
 
             this.mIsNewLU = false;
@@ -2118,15 +2115,21 @@ public class SpedizioneViewModel {
     }
 
     public void closeOrder() {
+        this.sendOnLoadingStarted();
+
         if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) {
             var printRequestResult = this.sendOnCloseOrderPrintRequest();
-            this.onCloseOrderPrintRequest(printRequestResult);
+            this.onCloseOrderPrintRequested(printRequestResult);
         }
 
-        this.onOrderClosedPrintingDone();
+        if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) {
+            this.sendCreateDocsRequest();
+        }
+
+        this.sendOnOrderClosed();
     }
 
-    private void onCloseOrderPrintRequest(PrintOrderCloseDTO dto) {
+    private void onCloseOrderPrintRequested(PrintOrderCloseDTO dto) {
         if (!dto.isFlagPrintPackingList() && !dto.isFlagPrintSSCC()) {
             return;
         }
@@ -2142,13 +2145,22 @@ public class SpedizioneViewModel {
 
         dto.setPrintList(closedOrders);
 
+        CountDownLatch latch = new CountDownLatch(1);
+
         try {
             printClosedOrders(dto);
+            latch.countDown();
         } catch (Exception e) {
             this.sendLUPrintError(e, () -> {
+                latch.countDown();
             });
         }
 
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private void printClosedOrders(PrintOrderCloseDTO dto) throws Exception {
@@ -2181,8 +2193,8 @@ public class SpedizioneViewModel {
         return mPartitaMagList;
     }
 
-    public ArrayList<MtbColt> getCreatedMtbColts() {
+    public ArrayList<AlreadyRegisteredUlDTO> getCreatedMtbColts() throws Exception {
-        return (ArrayList<MtbColt>) this.mColliRegistrati;
+        return (ArrayList<AlreadyRegisteredUlDTO>) this.mOrdiniRestConsumerService.getBancaliGiaRegistratiSynchronized(mTestateOrdini, mDefaultSegnoCol);
     }
 
     public VtbVett getDefaultVettore() {
@@ -2190,30 +2202,51 @@ public class SpedizioneViewModel {
     }
 
     void createDocs() {
-        var loadCollidto = new LoadColliDTO();
+        executorService.execute(() -> {
+            this.sendOnLoadingStarted();
+            List<MtbColt> registeredUds = null;
 
-        var codAnag = mTestateOrdini.stream()
+            try {
-                .map(OrdineUscitaInevasoDTO::getCodAnagOrd)
+                var alreadyCreatedUds = getCreatedMtbColts();
-                .filter(Objects::nonNull)
+                registeredUds = alreadyCreatedUds.stream()
-                .distinct()
+                        .map(AlreadyRegisteredUlDTO::getMtbColt)
-                .findFirst()
+                        .collect(Collectors.toList());
-                .get();
+            } catch (Exception e) {
+                sendError(e);
+                return;
+            }
 
-        var codVdes = mTestateOrdini.stream().map(OrdineUscitaInevasoDTO::getCodVdes)
+            var loadCollidto = new LoadColliDTO();
-                .filter(Objects::nonNull)
-                .distinct()
-                .findFirst()
-                .get();
 
-        loadCollidto.setColli(getCreatedMtbColts());
+            var codAnag = mTestateOrdini.stream()
-        loadCollidto.setCodDtip(SettingsManager.iDB().getCodDtipOrdTrasfV());
+                    .map(OrdineUscitaInevasoDTO::getCodAnagOrd)
-        loadCollidto.setCodMdep(mDefaultCodMdep);
+                    .filter(Objects::nonNull)
-        loadCollidto.setCodAnag(codAnag);
+                    .distinct()
-        loadCollidto.setCodVdes(codVdes);
+                    .findFirst()
-        loadCollidto.setSaveDoc(true);
+                    .get();
-        loadCollidto.setGestione("L");
 
-        this.mDocumentRESTConsumer.createDocFromColli(loadCollidto, doc -> this.sendOnOrderClosed(), this::sendError);
+            var codVdes = mTestateOrdini.stream()
+                    .map(OrdineUscitaInevasoDTO::getCodVdes)
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .findFirst()
+                    .get();
+
+            loadCollidto.setColli(registeredUds);
+            loadCollidto.setCodDtip(SettingsManager.iDB().getCodDtipOrdTrasfV());
+            loadCollidto.setCodMdep(mDefaultCodMdep);
+            loadCollidto.setCodAnag(codAnag);
+            loadCollidto.setCodVdes(codVdes);
+            loadCollidto.setSaveDoc(true);
+            loadCollidto.setGestione("L");
+
+            try {
+                this.mDocumentRESTConsumer.makeSynchronousCreateDocFromColliRequest(loadCollidto);
+            } catch (Exception e) {
+                sendError(e);
+            }
+            this.sendOnLoadingEnded();
+        });
     }
 
     private Integer sendInputDuplicate() {

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java

@@ -4,6 +4,7 @@ import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -63,6 +64,9 @@ public class DialogAskClienteView extends BaseDialogFragment {
     @Inject
     DialogProgressView dialogProgressView;
 
+    @Inject
+    Handler handler;
+
     public static DialogAskClienteView newInstance(@NotNull RunnableArgss<VtbDest, String> onComplete, @NotNull Runnable onAbort) {
         return new DialogAskClienteView(onComplete, onAbort);
     }
@@ -119,6 +123,8 @@ public class DialogAskClienteView extends BaseDialogFragment {
         DialogAskCliente_Page1ViewModel viewModel1 = (DialogAskCliente_Page1ViewModel) mAdapter.getViewModel(R.layout.dialog_ask_cliente__page1);
         DialogAskCliente_Page2ViewModel viewModel2 = (DialogAskCliente_Page2ViewModel) mAdapter.getViewModel(R.layout.dialog_ask_cliente__page2);
 
+        viewModel1.setHandler(handler);
+
         viewModel1.setOnConfirmClickListener(() -> {
             String codAnag = viewModel1.getCurrentCliente();
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java

@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel;
 
 import android.content.Context;
+import android.os.Handler;
 import android.widget.AutoCompleteTextView;
 
 import androidx.databinding.ObservableArrayList;
@@ -37,9 +38,15 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
     private Runnable onConfirmClickListener;
     private Runnable onAbortClickListener;
 
+    private Handler handler;
+
     public DialogAskCliente_Page1ViewModel() {
     }
 
+    public void setHandler(Handler handler){
+        this.handler = handler;
+    }
+
     @Override
     public void setContext(Context context) {
         this.mContext = context;
@@ -147,33 +154,33 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
 
 
     private void initializeAdapter(ArrayList<DialogAskClienteClienteDTO> items) {
+        handler.post(() -> {
+            var orderedList = Stream.of(items)
+                    .sortBy(x -> x.getRagSoc() != null ? x.getRagSoc() : "")
+                    .toList();
 
-        var orderedList = Stream.of(items)
+            DialogAskCliente_Page1_Cliente_ArrayAdapter adapter = new DialogAskCliente_Page1_Cliente_ArrayAdapter(mContext, orderedList);
-                .sortBy(x -> x.getRagSoc() != null ? x.getRagSoc() : "")
-                .toList();
 
-        DialogAskCliente_Page1_Cliente_ArrayAdapter adapter = new DialogAskCliente_Page1_Cliente_ArrayAdapter(mContext, orderedList);
+            AutoCompleteTextView editTextDropdownCliente = mBinding.dropdownCliente;
+            editTextDropdownCliente.setThreshold(0);
+            editTextDropdownCliente.setAdapter(adapter);
+            editTextDropdownCliente.setOnItemClickListener((parent, view, position, id) -> {
+                refreshCodJcoms(items.get(position));
+            });
 
-        AutoCompleteTextView editTextDropdownCliente = mBinding.dropdownCliente;
+            DialogAskCliente_Page1_Commessa_ArrayAdapter commessaAdapter = new DialogAskCliente_Page1_Commessa_ArrayAdapter(mContext);
-        editTextDropdownCliente.setThreshold(0);
-        editTextDropdownCliente.setAdapter(adapter);
-        editTextDropdownCliente.setOnItemClickListener((parent, view, position, id) -> {
-            refreshCodJcoms(items.get(position));
-        });
 
+            AutoCompleteTextView editTextDropdownCommessa = mBinding.dropdownCommessa;
+            editTextDropdownCommessa.setThreshold(0);
+            editTextDropdownCommessa.setAdapter(commessaAdapter);
 
-        DialogAskCliente_Page1_Commessa_ArrayAdapter commessaAdapter = new DialogAskCliente_Page1_Commessa_ArrayAdapter(mContext);
+            codJcoms.addOnListChangedCallback(new OnListGeneralChangedCallback() {
-
+                @Override
-        AutoCompleteTextView editTextDropdownCommessa = mBinding.dropdownCommessa;
+                public void onChanged(ObservableList sender) {
-        editTextDropdownCommessa.setThreshold(0);
+                    commessaAdapter.clear();
-        editTextDropdownCommessa.setAdapter(commessaAdapter);
+                    commessaAdapter.addAll(codJcoms);
-
+                }
-        codJcoms.addOnListChangedCallback(new OnListGeneralChangedCallback() {
+            });
-            @Override
-            public void onChanged(ObservableList sender) {
-                commessaAdapter.clear();
-                commessaAdapter.addAll(codJcoms);
-            }
         });
     }
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java

@@ -92,7 +92,7 @@ public class DialogChooseArtFromListaArtsView extends BaseDialogFragment {
 
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
-        dismiss();
+        //dismiss();
     }
 
     public void dismiss(MtbAart item) {

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java

@@ -41,6 +41,7 @@ public class DialogInputQuantityV2DTO {
     private boolean isNotesAllowed = false;
     private boolean isNotesMandatory = false;
     private boolean isNumCnfEditable = true;
+    private boolean isQtaTotEditable = true;
     private boolean isFocusOnStart = true;
     private boolean canLUBeClosed;
     private boolean saveOnImeDone = false;
@@ -323,6 +324,15 @@ public class DialogInputQuantityV2DTO {
         return this;
     }
 
+    public boolean isQtaTotEditable() {
+        return isQtaTotEditable;
+    }
+
+    public DialogInputQuantityV2DTO setQtaTotEditable(boolean qtaTotEditable) {
+        this.isQtaTotEditable = qtaTotEditable;
+        return this;
+    }
+
     public RunnableArgsWithReturn<DialogInputQuantityV2ViewModel, String> getSuggestPartitaMag() {
         return suggestPartitaMag;
     }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java

@@ -255,9 +255,9 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     }
 
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
-        this.onLoadingStarted();
+        handler.post(() -> {
+            this.onLoadingStarted();
 
-        executorService.execute(() -> {
             try {
                 this.mViewModel.processBarcodeDTO(data);
                 this.onLoadingEnded();
@@ -397,7 +397,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
             toggleTextInputLayoutError(textColorsNumCnf, this.mBindings.inputNumCnfLayout, value);
 
             if (this.mViewModel.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
-                this.enabledQtaTot.set(!value);
+                this.enabledQtaTot.set(this.mDialogInputQuantityV2DTO.isQtaTotEditable() && !value);
             } else {
                 if (value) {
                     if (this.mViewModel.blockedQtaCnf.get()) {
@@ -407,7 +407,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                     }
                 } else {
                     if (!this.enabledQtaTot.get()) {
-                        this.enabledQtaTot.set(true);
+                        this.enabledQtaTot.set(this.mDialogInputQuantityV2DTO.isQtaTotEditable());
                     } else if (!this.enabledQtaCnf.get()) {
                         this.enabledQtaCnf.set(true);
                     }
@@ -426,7 +426,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 }
             } else {
                 if (!this.enabledQtaTot.get()) {
-                    this.enabledQtaTot.set(true);
+                    this.enabledQtaTot.set(this.mDialogInputQuantityV2DTO.isQtaTotEditable());
                 } else if (!this.enabledNumCnf.get()) {
                     this.enabledNumCnf.set(this.mDialogInputQuantityV2DTO.isNumCnfEditable());
                 }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java

@@ -182,7 +182,7 @@ public class DialogScanOrCreateLUViewModel {
 
                     } else {
                         var createUdcRequest = new CreateUDCRequestDTO()
-                                .setBarcodeUl(barcodeScanDTO.getStringValue())
+                                .setBarcodeUl(ean128Model.Sscc)
                                 .setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep());
 
                         this.mColliLavorazioneRESTConsumer.createUDC(createUdcRequest, createdMtbColt -> {

build.gradle

@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '2.1.0'
-        agp_version = '8.8.0'
+        agp_version = '8.10.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.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME