Fix post test Sapori

app/build.gradle

@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 58
+    def appVersionCode = 59
-    def appVersionName = '1.4.0'
+    def appVersionName = '1.4.1'
 
     signingConfigs {
         release {

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

@@ -296,6 +296,11 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
 
                 if(!UtilityString.isNullOrEmpty(ean128Model.Sscc)){
                     this.executeEtichettaLU(ean128Model.Sscc, progressDialog);
+                } else if(!UtilityString.isNullOrEmpty(barcodeProd)) {
+                    if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
+                        barcodeProd = barcodeProd.substring(1, barcodeProd.length());
+                    }
+                    this.loadArticolo(barcodeProd, ean128Model, progressDialog);
                 } else {
                     showNoULFound(() -> {
                         BarcodeManager.enable();
@@ -328,7 +333,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
         ArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
 
             if(mtbAartList != null && mtbAartList.size() > 0) {
-
+                progressDialog.dismiss();
                 this.dispatchArt(mtbAartList.get(0), ean128Model);
 
             } else {
@@ -397,13 +402,15 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
             }
 
 
-            qtaDto.setShouldAskDataScad(true);
+            // qtaDto.setShouldAskDataScad(true);
         }
 
 
         DialogInputQuantity.makeBase(mContext, qtaDto, true, (quantityDTO) -> {
             onPostDispatch(mtbAart, quantityDTO);
-        }, null).show();
+        }, () -> {
+            BarcodeManager.enable();
+        }).show();
     }
 
 
@@ -414,7 +421,8 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
                 .setPartitaMag(quantityDTO.batchLot.get())
                 .setDataScadPartita(quantityDTO.expireDate)
                 .setQtaCol(quantityDTO.qtaTot.getBigDecimal())
-                .setDescrizione(mtbAart.getDescrizioneEstesa());
+                .setDescrizione(mtbAart.getDescrizioneEstesa())
+                .setMtbAart(mtbAart);
 
         mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
 
@@ -701,7 +709,8 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked<MtbColr> {
 
         mBinding.bottomSheetActionsDeleteBtn.setOnClickListener(v -> onItemDelete(item));
 
-        mBinding.bottomSheetActionsQuantity.setText(UtilityNumber.decimalToString(clickedItem.getQtaCol()) +  " " + clickedItem.getMtbAart().getUntMis());
+        String untMis = !UtilityString.isNullOrEmpty(clickedItem.getMtbAart().getUntMis()) ? clickedItem.getMtbAart().getUntMis() : "-";
+        mBinding.bottomSheetActionsQuantity.setText(UtilityNumber.decimalToString(clickedItem.getQtaCol()) +  " " + untMis);
     }
 
 

app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java

@@ -44,6 +44,7 @@ public class PickingObjectDTO implements Parcelable {
     private MtbAart mtbAart;
 
     private Boolean hidden = null;
+    private Boolean deactivated = null;
     private Boolean tempHidden = null;
     private PickData tempPickData = null;
 
@@ -74,6 +75,7 @@ public class PickingObjectDTO implements Parcelable {
         partitaMag = in.readString();
         codAlis = in.readString();
         hidden = in.readByte() == 0x00 ? null : in.readByte() != 0x00;
+        deactivated = in.readByte() == 0x00 ? null : in.readByte() != 0x00;
 
         if (in.readByte() == 0) {
             qtaCollo = null;
@@ -133,6 +135,12 @@ public class PickingObjectDTO implements Parcelable {
             dest.writeByte((byte) (0x01));
             dest.writeByte((byte) (hidden ? 0x01 : 0x00));
         }
+        if (deactivated == null) {
+            dest.writeByte((byte) (0x00));
+        } else {
+            dest.writeByte((byte) (0x01));
+            dest.writeByte((byte) (deactivated ? 0x01 : 0x00));
+        }
 
         if (qtaCollo == null) {
             dest.writeByte((byte) (0x00));
@@ -405,6 +413,15 @@ public class PickingObjectDTO implements Parcelable {
         return this;
     }
 
+    public Boolean isDeactivated() {
+        return deactivated;
+    }
+
+    public PickingObjectDTO setDeactivated(boolean deactivated) {
+        this.deactivated = deactivated;
+        return this;
+    }
+
     public Boolean isTempHidden() {
         return tempHidden;
     }

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java

@@ -152,6 +152,7 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter<Ma
                 View groupModelView = groupModelViewPool;
                 holder.pool.add(groupModelView);
 
+
                 if (rowItem.getQtaRiservata().subtract(rowItem.getQtaOrdinata()).floatValue() >= 0 ) {
                     groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.green_500_with_alpha));
                 } else if (rowItem.getQtaRiservata().floatValue() > 0) {
@@ -200,8 +201,18 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter<Ma
                 qtaTot.setText(UtilityNumber.decimalToString(rowItem.getQtaOrdinata()));
 
 
+
+
+
+                final View deactivatedOverBG = groupModelView.findViewById(R.id.deactivated_over_bg);
+                deactivatedOverBG.setVisibility(rowItem.getOriginalModel().isDeactivated() ? View.VISIBLE : View.GONE);
+                groupModelView.setAlpha(rowItem.getOriginalModel().isDeactivated() ? 0.8f : 1);
+                badge1.setBackground(mContext.getResources().getDrawable(rowItem.getOriginalModel().isDeactivated() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner));
+                qtaEvasa.setTextColor(mContext.getResources().getColor(rowItem.getOriginalModel().isDeactivated() ? R.color.gray_600 : R.color.green_700));
+
+
                 groupModelView.setOnClickListener(view -> {
-                    if (mOrdineRowDispatch != null) {
+                    if (mOrdineRowDispatch != null && !rowItem.getOriginalModel().isDeactivated()) {
 //                        rowItem.getOriginalModel().setTempEan128Model(null);
                         mOrdineRowDispatch.onOrdineRowDispatch(rowItem.getOriginalModel());
                     }

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/VenditaOrdineInevasoHelper.java

@@ -42,6 +42,8 @@ public class VenditaOrdineInevasoHelper {
 
     public List<List<PickingObjectDTO>> getPickingListRaggruppataPerPosizione(List<PickingObjectDTO> mPickingList, boolean forceHiddenCheck){
 
+
+
         List<String> listOfKnownPositions = Stream.of(mPickingList)
                 .map(PickingObjectDTO::getPosizione)
                 .distinctBy(x -> x)
@@ -49,8 +51,16 @@ public class VenditaOrdineInevasoHelper {
                 .sortBy(x -> x)
                 .toList();
 
+
         listOfKnownPositions.add(null);
 
+        String posizione = "Non disponibili al PICKING";
+        for(int i = 0; i < mPickingList.size(); i++) {
+            mPickingList.get(i).setDeactivated(mPickingList.get(i).getQtaCollo().floatValue() == 0);
+            if(mPickingList.get(i).isDeactivated()) mPickingList.get(i).setPosizione(posizione);
+        }
+        listOfKnownPositions.add(posizione);
+
         List<List<PickingObjectDTO>> groupedRighe = new ArrayList<>();
         for (String position : listOfKnownPositions) {
 
@@ -62,10 +72,7 @@ public class VenditaOrdineInevasoHelper {
                 if(tmpList.get(i).isHidden() == null || forceHiddenCheck) {
                     PickingObjectDTO tmpItem = tmpList.get(i);
 
-                    if (tmpItem.getQtaCollo().floatValue() <= 0) {
+                    tmpItem.setHidden(tmpItem.getQtaCollo().floatValue() < 0);
-                        tmpItem.setHidden(true);
-                    } else tmpItem.setHidden(false);
-
                     tmpItem.setTempHidden(false);
                 }
             }

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

@@ -1077,10 +1077,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             AtomicBigDecimal qtaTest = new AtomicBigDecimal();
 
             Stream.of(item.getWithdrawRows())
-                    .filter(x -> Objects.equals(x.getNumColloRif(), item.getNumCollo()) &&
+                    .filter(x -> ((x.getNumColloRif() == null) || Objects.equals(x.getNumColloRif(), item.getNumCollo()) &&
-                            x.getDataColloRifS().equalsIgnoreCase(item.getDataColloS()) &&
+                            ((x.getDataColloRifS() == null) || Objects.equals(x.getDataColloRifS(), item.getDataColloS())) &&
-                            x.getSerColloRif().equalsIgnoreCase(item.getSerCollo()) &&
+                            ((x.getSerColloRif() == null) || Objects.equals(x.getSerColloRif(), item.getSerCollo()))) &&
-                            x.getGestioneRif().equalsIgnoreCase(item.getGestione()))
+                            ((x.getGestioneRif() == null) || Objects.equals(x.getGestioneRif(), item.getGestione())))
                     .forEach(x -> {
                         qtaTest.addAndGet(x.getQtaCol());
                     });

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java

@@ -384,6 +384,8 @@ public class DialogInputQuantity {
             BarcodeManager.removeCallback(barcodeIstanceID);
         });
 
+        BarcodeManager.enable();
+
     }
 
 

app/src/main/res/drawable/badge1_round_corner.xml

@@ -4,8 +4,8 @@
     <solid android:color="@color/colorPrimary" />
 
     <padding
-        android:left="1dp"
+        android:left="6dp"
-        android:right="1dp"
+        android:right="6dp"
         android:top="1dp" />
 
     <corners android:radius="5dp" />

app/src/main/res/drawable/badge_gray_round_corner.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="@color/gray_600" />
+
+    <padding
+        android:left="6dp"
+        android:right="6dp"
+        android:top="1dp" />
+
+    <corners android:radius="5dp" />
+</shape>

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

@@ -3,13 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/full_white"
+    android:background="@color/full_white">
-    android:padding="8dp">
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="8dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -134,4 +135,13 @@
 
     </LinearLayout>
 
+    <View
+        android:id="@+id/deactivated_over_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignTop="@id/content_view"
+        android:layout_alignBottom="@id/content_view"
+        android:background="@android:color/black"
+        android:alpha="0.15" />
+
 </RelativeLayout>

gradle.properties

@@ -9,15 +9,31 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# org.gradle.jvmargs=-Xmx1536m
 
 
 android.databinding.enableV2=true
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableSeparateAnnotationProcessing = true
 
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+
+
+# Enable Gradle Daemon
+org.gradle.daemon=true
+# Enable Configure on demand
+org.gradle.configureondemand=true
+# Enable parallel builds
+org.gradle.parallel=true
+# Enable Build Cache
+android.enableBuildCache=true
+# Enable simple gradle caching
+org.gradle.caching=true
+#  Increase memory allotted to JVM
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8