Finish v.1.23.9(264)

2022-02-28 15:57:45 +01:00 · 2022-02-28 15:57:45 +01:00 · 453c8e0cad
commit 453c8e0cad
parent f6aadf1115 86d472fb88
10 changed files with 275 additions and 252 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'

 android {

-    def appVersionCode = 262
-    def appVersionName = '1.23.7'
+    def appVersionCode = 264
+    def appVersionName = '1.23.9'

    signingConfigs {
        release {
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java
@ -125,7 +125,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class);

        service.getOrdiniInevasi(codMdep, gestione.getText())
-                .enqueue(new Callback<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>>() {
+                .enqueue(new Callback<>() {
                    @Override
                    public void onResponse(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> response) {
                        analyzeAnswer(response, "getOrdiniInevasi", responseDtoList -> {
@ -145,7 +145,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
                });
    }

-    public void retrieveListaArticoliFromOrdiniUscita(List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void retrieveListaArticoliFromOrdiniUscita(String codMdep, List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
        List<GetPickingListDTO> getPickingListDTOs = Stream.of(orders)
                .map(x -> new GetPickingListDTO()
                        .setData(x.getDataOrdS())
@ -157,7 +157,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {

        OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);

-        service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
+        service.getArticoliFromOrdini(codMdep, getPickingListDTOs).enqueue(new Callback<>() {
            @Override
            public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
                analyzeAnswer(response, "retrieveListaArticoliFromOrdiniUscita", onComplete, onFailed);
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java
@ -16,7 +16,7 @@ import retrofit2.http.Query;
 public interface OrdiniRESTConsumerService {

    @POST("wms/getArticoliFromOrdini")
-    Call<ServiceRESTResponse<List<SitArtOrdDTO>>> getArticoliFromOrdini(@Body List<GetPickingListDTO> pickingListDTO);
+    Call<ServiceRESTResponse<List<SitArtOrdDTO>>> getArticoliFromOrdini(@Query("codMdep") String codMdep, @Body List<GetPickingListDTO> pickingListDTO);

    @POST("wms/getSuggestedPickingList")
    Call<ServiceRESTResponse<List<PickingObjectDTO>>> getSuggestedPickingList(@Query("codMdep") String codMdep, @Body List<SitArtOrdDTO> sitArtOrdDTOList);
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java
@ -19,6 +19,7 @@ public class SitArtOrdDTO {
    private String idViaggio;
    private String codMdep;
    private boolean flagEnablePickManuale;
+    private boolean flagEnableScanArt;
    private String codMgrp;
    private String descrizioneMgrp;
    private String codMsgr;
@ -145,6 +146,14 @@ public class SitArtOrdDTO {
        return this;
    }

+    public boolean isFlagEnableScanArt() {
+        return flagEnableScanArt;
+    }
+
+    public SitArtOrdDTO setFlagEnableScanArt(boolean flagEnableScanArt) {
+        this.flagEnableScanArt = flagEnableScanArt;
+        return this;
+    }

    public String getCodMgrp() {
        return codMgrp;
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
@ -697,11 +697,11 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
    };

    private void refreshList(List<OrdiniUscitaElencoDTO> filteredList) {
-        this.onLoadingStarted();

-        //new Thread(() -> {
+//        new Thread(() -> {

-        requireActivity().runOnUiThread(() -> {
+//        requireActivity().runOnUiThread(() -> {
+//        this.onLoadingStarted();
        List<OrdiniUscitaElencoDTO> tmpList;

        if (filteredList != null) {
@ -721,10 +721,10 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
        fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
                .anyMatch(y -> y.getSelectedObservable().get()));

-            this.onLoadingEnded();
-        });
+//        this.onLoadingEnded();
+//        });

-        //}).start();
+//        }).start();

    }

--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java
@ -104,7 +104,7 @@ public class OrdiniUscitaElencoViewModel {
                .distinct()
                .toList();

-        if (foundGestioni != null && foundGestioni.size() > 1) {
+        if (foundGestioni.size() > 1) {
            this.sendError(new InvalidLUMultiGestioneException());
            return;
        }
@ -116,7 +116,7 @@ public class OrdiniUscitaElencoViewModel {
                .distinct()
                .toList();

-        if (foundCodMdep != null && foundCodMdep.size() > 1) {
+        if (foundCodMdep.size() > 1) {
            this.sendError(new InvalidLUMultiCodMdepException());
            return;
        }
@ -128,9 +128,9 @@ public class OrdiniUscitaElencoViewModel {
                .map(x -> (OrdineUscitaInevasoDTO) x)
                .toList();

-        this.mOrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(selectedOrdersBase, sitArts -> {
+        this.mOrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(mCurrentCodMdep, selectedOrdersBase, sitArts -> {

-            if(mtbGrupToFilter != null && !mtbGrupToFilter.isEmpty()) {
+            if (mtbGrupToFilter != null && !mtbGrupToFilter.isEmpty()) {
                sitArts = Stream.of(sitArts)
                        .filter(x -> Stream.of(mtbGrupToFilter).map(MtbGrup::getCodMgrp).anyMatch(y -> y.equalsIgnoreCase(x.getCodMgrp())))
                        .toList();
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
@ -708,6 +708,7 @@ public class SpedizioneViewModel {

        List<PickingObjectDTO> matchPickingObject = Stream.of(pickingList)
                .filter(x -> UtilityString.equalsIgnoreCase(mtbAart.getCodMart(), x.getSitArtOrdDTO().getCodMart()))
+                .filter(x -> x.getSitArtOrdDTO().isFlagEnableScanArt())
                .filter(x -> {
                    MtbPartitaMag mtbPartitaMag = pickData != null && pickData.getManualPickDTO() != null && pickData.getManualPickDTO().getMtbPartitaMag() != null ? pickData.getManualPickDTO().getMtbPartitaMag() : null;
                    return !mEnableCheckPartitaMag || (mtbPartitaMag != null && UtilityString.equalsIgnoreCase(x.getSitArtOrdDTO().getPartitaMag(), mtbPartitaMag.getPartitaMag()));
@ -742,8 +743,8 @@ public class SpedizioneViewModel {
                this.getPickingList().postValue(pickingList);
            } else {
                MtbColt refMtbColt = matchedItem.getRefMtbColt();
-                MtbColr refMtbColr = refMtbColt != null ? matchedItem.getRefMtbColt().getMtbColr().get(0) : null;
-                this.dispatchOrdineRow(matchedItem, refMtbColt, refMtbColr, false);
+                MtbColr refMtbColr = refMtbColt != null ? refMtbColt.getMtbColr().get(0) : null;
+                this.dispatchOrdineRow(matchedItem, refMtbColt, refMtbColr, refMtbColr == null);
            }

        } else {
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
@ -209,10 +209,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
    public void onStart() {
        super.onStart();

-        if(!mFirstStart) {
+//        if(!mFirstStart) {
            this.init();
-            mFirstStart = false;
-        }
+//            mFirstStart = false;
+//        }

        int onNumCnfInputChanged = SettingsManager.iDB().getOnNumCnfInputChanged();

--- a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
+++ b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>

-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:fab="http://schemas.android.com/apk/res-auto">
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
    <data>

        <import type="android.view.View" />
+
        <variable
            name="viewModel"
            type="it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity" />
@ -18,64 +20,61 @@
        android:layout_height="match_parent">


-        <LinearLayout
-            android:id="@+id/linearLayout2"
+        <androidx.constraintlayout.widget.ConstraintLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:background="@color/full_white"
-            android:orientation="vertical"
-            android:descendantFocusability="blocksDescendants"
-            >
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/full_white"
-                android:orientation="vertical"
-                android:paddingTop="8dp"
-                tools:context=".gest.contenuto_bancale.ContenutoBancaleActivity">
+            android:descendantFocusability="blocksDescendants">

            <it.integry.integrywmsnative.ui.ElevatedToolbar
                android:id="@+id/elevated_toolbar"
                android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent">

                <androidx.appcompat.widget.Toolbar
                    android:id="@+id/toolbar"
                    android:layout_width="match_parent"
                    android:layout_height="?actionBarSize">
+
                    <androidx.appcompat.widget.AppCompatTextView
                        android:id="@+id/toolbar_title"
+                        style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                            tools:text="modifica ordine"
-                            style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
-                            android:layout_gravity="start" />
+                        android:layout_gravity="start"
+                        tools:text="modifica ordine" />

                    <androidx.appcompat.widget.AppCompatImageButton
                        android:id="@+id/add_extra_items_toolbar"
                        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:background="@drawable/ripple_effect"
                        android:onClick="@{()->viewModel.manualSearch()}"
-                            android:tint="@color/colorPrimaryGray"/>
+                        android:src="@drawable/ic_search_black_24dp"
+                        android:tint="@color/colorPrimaryGray" />
                </androidx.appcompat.widget.Toolbar>

            </it.integry.integrywmsnative.ui.ElevatedToolbar>

-                <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/header_content"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginLeft="8dp"
                android:layout_marginRight="8dp"
                android:background="@drawable/gray_detail_background_round8"
                android:orientation="vertical"
+                app:layout_constraintTop_toBottomOf="@id/elevated_toolbar"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                android:padding="16dp">

-                    <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="horizontal">
@ -84,7 +83,7 @@
                        style="@style/AppTheme.NewMaterial.Text.Small"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                            android:text="ordine: "
+                        android:text="ordine:"
                        android:textColor="@android:color/black"
                        android:textSize="16sp" />

@ -93,13 +92,14 @@
                        style="@style/AppTheme.NewMaterial.Text.Small"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
                        android:textColor="@android:color/black"
                        android:textSize="16sp"
                        android:textStyle="bold"
                        tools:text="22 ottobre 2018" />
-                    </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>

-                    <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="horizontal">
@ -108,7 +108,7 @@
                        style="@style/AppTheme.NewMaterial.Text.Small"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                            android:text="Griglia "
+                        android:text="Griglia"
                        android:textColor="@android:color/black" />

                    <androidx.appcompat.widget.AppCompatTextView
@ -116,13 +116,14 @@
                        style="@style/AppTheme.NewMaterial.Text.Small"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:paddingEnd="2dp"
                        android:textColor="@android:color/black"
                        android:textStyle="italic"
-                            tools:text="4SECCO" />
-                    </LinearLayout>
+                        tools:text="4SAPORIV" />
+                </androidx.appcompat.widget.LinearLayoutCompat>

-
-                    <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="12dp"
@ -143,58 +144,63 @@
                        android:textColor="@android:color/black"
                        android:textStyle="bold"
                        tools:text="10" />
-                    </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>


-                </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>


            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/articoli_ordine_list"
                android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                android:layout_height="0dp"
                android:layout_marginTop="16dp"
                android:layout_marginBottom="92dp"
                android:paddingStart="2dp"
-                    android:paddingEnd="2dp" />
-                <LinearLayout
+                android:paddingEnd="2dp"
+                android:clipToPadding="false"
+                android:paddingBottom="72dp"
+                android:scrollbars="vertical"
+                app:layout_constraintTop_toBottomOf="@id/header_content"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
                android:id="@+id/scan_art_spinner"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_horizontal"
                android:layout_marginTop="24dp"
+                android:orientation="horizontal"
                android:visibility="visible"
-                    android:orientation="horizontal">
+                app:layout_constraintTop_toBottomOf="@id/header_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent">


                <ProgressBar
                    android:id="@+id/progressBar"
                    style="?android:attr/progressBarStyle"
                    android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content" />

                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                        android:textSize="16sp"
+                    android:layout_gravity="center_vertical"
                    android:layout_marginStart="8dp"
                    android:layout_marginEnd="12dp"
-                        android:layout_gravity="center_vertical"
                    android:gravity="center_horizontal"
-                        style="@style/AppTheme.NewMaterial.Text"
-                        android:text="@string/scan_item"/>
-                </LinearLayout>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
+                    android:text="@string/scan_item"
+                    android:textSize="16sp" />
+            </androidx.appcompat.widget.LinearLayoutCompat>

            <com.github.clans.fab.FloatingActionMenu
                android:id="@+id/close_activity_fab"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_anchor="@+id/linearLayout2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
                app:layout_anchorGravity="center"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
@ -254,5 +260,12 @@


            </com.github.clans.fab.FloatingActionMenu>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+
 </layout>
--- a/build.gradle
+++ b/build.gradle
@ -10,7 +10,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:7.1.2'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath 'com.google.gms:google-services:4.3.10'