Fix after merge

.idea/appInsightsSettings.xml

@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AppInsightsSettings">
-    <option name="selectedTabId" value="Android Vitals" />
+    <option name="selectedTabId" value="Firebase Crashlytics" />
     <option name="tabSettings">
       <map>
+        <entry key="Android Vitals">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="it.integry.ordify.dulciar" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="SEVEN_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
         <entry key="Firebase Crashlytics">
           <value>
             <InsightsFilterSettings>

app/build.gradle

@@ -92,7 +92,7 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
         exclude group: 'com.android.support', module: 'support-annotations'

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

@@ -112,6 +112,7 @@ import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetM
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalModule;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
+import it.integry.integrywmsnative.view.dialogs.ask_commessa.DialogAskCommessaComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdComponent;
 import it.integry.integrywmsnative.view.dialogs.ask_linea_prod.DialogAskLineaProdModule;
 import it.integry.integrywmsnative.view.dialogs.ask_unknown_barcode_notes.DialogAskUnknownBarcodeNotesComponent;
@@ -369,6 +370,11 @@ public interface MainApplicationComponent {
 
     DialogAskVettoreComponent.Factory dialogAskVettoreComponent();
 
+    DialogAskCommessaComponent.Factory dialogAskCommessaComponent();
+
+    DialogCreateNewArtComponent.Factory dialogCreateNewArtComponent();
+
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);

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

@@ -423,7 +423,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
                 .spostaULInPosizione(codMdep,
                         posizioneString,
                         mtbColtToMoveClone)
-                .enqueue(new Callback<ServiceRESTResponse<Object>>() {
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
                         analyzeAnswer(response, "changePosizione", mtbColts -> {

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

@@ -180,6 +180,15 @@ public class DBSettingsModel {
         return this;
     }
 
+    public boolean isFlagAskCommessaInPickingLiberoLav() {
+        return flagAskCommessaInPickingLiberoLav;
+    }
+
+    public DBSettingsModel setFlagAskCommessaInPickingLiberoLav(boolean flagAskCommessaInPickingLiberoLav) {
+        this.flagAskCommessaInPickingLiberoLav = flagAskCommessaInPickingLiberoLav;
+        return this;
+    }
+
     public boolean isFlagPickLiberoAllowEmptyCliente() {
         return flagPickLiberoAllowEmptyCliente;
     }

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBigDecimal.java

@@ -91,4 +91,8 @@ public class UtilityBigDecimal {
         return input == null || equalsTo(input, BigDecimal.ZERO);
     }
 
+    public static BigDecimal isNull(BigDecimal input1, BigDecimal input2) {
+        return input1 == null ? input2 : input1;
+    }
+
 }

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

@@ -474,11 +474,11 @@ public class AccettazioneOrdiniPickingViewModel {
                 });
 
         BigDecimal numCnfDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getNumCnfDaEvadere().subtract(numCnfWithdrawRows.getBigDecimalValue());
-        BigDecimal qtaDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getQtaDaEvadere().subtract(qtaColWithdrawRows.getBigDecimalValue());
+        BigDecimal qtaColDaEvadere = pickingObjectDTO.getSitArtOrdDTO().getQtaDaEvadere().subtract(qtaColWithdrawRows.getBigDecimalValue());
         BigDecimal qtaCnfDaEvadere = qtaCnfOrd;
 
         numCnfDaEvadere = UtilityBigDecimal.getGreaterBetween(numCnfDaEvadere, BigDecimal.ZERO);
-        qtaDaEvadere = UtilityBigDecimal.getGreaterBetween(qtaDaEvadere, BigDecimal.ZERO);
+        qtaColDaEvadere = UtilityBigDecimal.getGreaterBetween(qtaColDaEvadere, BigDecimal.ZERO);
 
         BigDecimal numCnfDaPrelevare = null;
         BigDecimal qtaColDaPrelevare = null;
@@ -569,10 +569,15 @@ public class AccettazioneOrdiniPickingViewModel {
         }
 
         if (executeImmediately) {
+
+            BigDecimal numCnf = UtilityBigDecimal.isNull(numCnfDaPrelevare, numCnfDaEvadere);
+            BigDecimal qtaTot = UtilityBigDecimal.isNull(qtaColDaPrelevare, qtaColDaEvadere);
+            BigDecimal qtaCnf = UtilityBigDecimal.isNull(qtaCnfDaPrelevare, qtaCnfDaEvadere);
+
             this.saveNewRow(pickingObjectDTO,
-                    numCnfDaPrelevare,
+                    numCnf,
-                    qtaCnfDaPrelevare,
+                    qtaCnf,
-                    qtaColDaPrelevare,
+                    qtaTot,
                     partitaMag,
                     dataScad,
                     false);
@@ -581,7 +586,7 @@ public class AccettazioneOrdiniPickingViewModel {
                     pickingObjectDTO,
                     pickingObjectDTO.getMtbAart(),
                     initialNumCnf, initialQtaCnf, initialQtaTot,
-                    qtaDaEvadere,
+                    qtaColDaEvadere,
                     numCnfDaEvadere,
                     qtaCnfDaEvadere,
                     qtaColDaPrelevare,

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java

@@ -70,7 +70,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                 "           CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " +
                 "                                   SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
                 "                                   SUM(CASE WHEN dtb_ord_steps.hr_num > 0 then dtb_ord_steps.hr_num else 1 end) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
-                "                                  0))                                as percentage_hr " +
+                "                                  0)                                as percentage_hr " +
                 "    FROM mtb_colr " +
                 "             INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " +
                 "        AND mtb_colr.data_collo = mtb_colt.data_collo " +

build.gradle

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