Finish v1.46.10(498)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 495
+    def appVersionCode = 498
-    def appVersionName = '1.46.07'
+    def appVersionName = '1.46.10'
 
     signingConfigs {
         release {

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_picking/AccettazioneBollaPickingActivity.java

@@ -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/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()) &&

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,7 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
                 .setTotalNumCnfOrd(incomingNumCnf)
                 .setPartitaMag(partitaMag)
                 .setDataScad(dataScad)
+                .setCanInputZeroQuantity(true)
                 .setCanLUBeClosed(false);
 
         if (!dialogInputQuantityV2View.isVisible())

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,7 +154,7 @@ 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();
@@ -161,7 +168,6 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
                 refreshCodJcoms(items.get(position));
             });
 
-
             DialogAskCliente_Page1_Commessa_ArrayAdapter commessaAdapter = new DialogAskCliente_Page1_Commessa_ArrayAdapter(mContext);
 
             AutoCompleteTextView editTextDropdownCommessa = mBinding.dropdownCommessa;
@@ -175,6 +181,7 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
                     commessaAdapter.addAll(codJcoms);
                 }
             });
+        });
     }
 
     private void refreshCodJcoms(DialogAskClienteClienteDTO item) {

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

@@ -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());
                 }