Implementato pulsante per inserimento manuale dei barcode in Spedizione.

Aggiunto dismiss della progress in Recupero Materiale Produzione.

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java

@@ -197,6 +197,7 @@ public class ProdRecuperoMaterialeViewModel {
                             mOnRecuperoCompleted.run();
                         });
                     } else {
+                        progress.dismiss();
                         this.refreshAdapter();
                         mOnRecuperoCompleted.run();
                     }

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.gest.vendita_ordine_inevaso;
 
+import android.app.Dialog;
 import android.content.Intent;
 import androidx.databinding.DataBindingUtil;
 import androidx.appcompat.app.AppCompatActivity;
@@ -9,6 +10,7 @@ import android.view.MenuItem;
 
 import java.util.ArrayList;
 
+import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
@@ -17,6 +19,7 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.data_cache.DataCache;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.databinding.ActivityVenditaOrdineInevasoBinding;
 import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetBinding;
 import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliActivity;
@@ -24,6 +27,7 @@ import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.vendita_ordine_inevaso.viewmodel.VenditaOrdineInevasoViewModel;
 import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
 
 public class VenditaOrdineInevasoActivity extends BaseActivity {
 

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java

@@ -19,6 +19,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 
+import it.integry.barcode_base_android_library.model.BarcodeType;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
@@ -64,6 +65,7 @@ import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBot
 
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
 import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
 import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
@@ -179,23 +181,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                 defaultGestioneOfUL = GestioneEnum.VENDITA;
             }
 
-            //Definizione del deposito di default
-            List<String> foundCodMdep = Stream.of(mTestateOrdini)
-                    .map(OrdineVenditaInevasoDTO::getCodMdep)
-//                    .withoutNulls()
-                    .distinctBy(x -> x)
-                    .toList();
 
-//            if(foundCodMdep != null && foundCodMdep.size() > 1){
+            defaultCodMdepOfUL = SettingsManager.i().userSession.depo.getCodMdep();
-//                DialogSimpleMessageHelper.makeErrorDialog(mActivity, new SpannableString(mActivity.getString(R.string.error_multiple_cod_mdep_ordv)), null, () -> {
-//                    mActivity.finish();
-//                }).show();
-//                return;
-//            } else if(foundCodMdep != null && foundCodMdep.size() == 1){
-//                defaultCodMdepOfUL = foundCodMdep.get(0);
-//            } else {
-                defaultCodMdepOfUL = SettingsManager.i().userSession.depo.getCodMdep();
-//            }
 
 
 
@@ -1157,7 +1144,14 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                     } else {
                         dto.setQtaTot(tmpPickData.getQtaTot());
                         dto.setMaxQta(tmpPickData.getQtaTot());
-                        dto.setQtaCnf(tmpPickData.getQtaTot());
+
+                        if(tmpPickData.getNumCnf() != null) {
+                            dto.setQtaCnf(tmpPickData.getQtaTot().divide(tmpPickData.getNumCnf()));
+                        } else {
+                            dto.setQtaCnf(tmpPickData.getQtaTot());
+                        }
+
+
                     }
 
                     if (tmpPickData.getQtaCnf() != null && useQtaDaEvadere) {
@@ -1424,6 +1418,19 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
     }
 
 
+
+
+
+    public void manualSearch() {
+        BarcodeManager.disable();
+        DialogSimpleInputHelper.makeInputDialog(mActivity,"Inserisci il codice a barre", codice->{
+
+            this.onScanSuccessfull.run(new BarcodeScanDTO().setStringValue(codice).setType(BarcodeType.CODE128));
+
+        }, BarcodeManager::enable).show();
+    }
+
+
     private void showBatchLotDisabledWarning(String batchLot, Runnable onAccepted, Runnable onRejected) {
 
         DialogSimpleMessageHelper.makeWarningDialog(mActivity, new SpannableString(String.format(mActivity.getText(R.string.batch_lot_not_enabled).toString(), batchLot)), null, onAccepted, onRejected).show();

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

@@ -4,6 +4,7 @@ import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
 import android.text.SpannableString;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,7 +13,10 @@ import androidx.databinding.DataBindingUtil;
 
 import com.annimon.stream.Stream;
 
+import java.util.Date;
+
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;

app/src/main/res/layout/activity_vendita_ordine_inevaso.xml

@@ -2,6 +2,7 @@
 
     <data>
         <import type="android.view.View" />
+        <import type="it.integry.integrywmsnative.BuildConfig" />
 
         <variable
             name="viewmodel"
@@ -55,6 +56,18 @@
                             android:tint="@color/colorPrimaryGray"/>
 
 
+
+                        <androidx.appcompat.widget.AppCompatImageButton
+                            android:layout_width="wrap_content"
+                            android:layout_height="50dp"
+                            android:layout_gravity="end"
+                            android:background="@drawable/ripple_effect"
+                            android:adjustViewBounds="true"
+                            android:src="@drawable/ic_search_black_24dp"
+                            android:visibility="@{BuildConfig.DEBUG ? View.VISIBLE : View.GONE}"
+                            android:onClick="@{() -> viewmodel.manualSearch()}"
+                            android:tint="@color/colorPrimaryGray"/>
+
                     </androidx.appcompat.widget.Toolbar>
 
                 </com.google.android.material.appbar.AppBarLayout>

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext{
-        kotlin_version = '1.3.50'
+        kotlin_version = '1.3.61'
     }
 
     repositories {
@@ -16,7 +16,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.2'
+        classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.google.firebase:perf-plugin:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong