Finish v1.13.14(160)

Ripristinato pulsante Chiudi LU in dialogInputQuantity.

app/build.gradle

@@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 156
-    def appVersionName = '1.13.10'
+    def appVersionCode = 160
+    def appVersionName = '1.13.14'
 
     signingConfigs {
         release {
@@ -97,6 +97,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-perf'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-analytics'
+    implementation 'com.google.android.gms:play-services-basement:17.4.0'
 
 
     implementation 'androidx.appcompat:appcompat:1.2.0'

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java

@@ -498,7 +498,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                 .setQtaCnfAvailable(qtaCnfAvailable)
                 .setPartitaMag(partitaMag)
                 .setDataScad(dataScad)
-                .setCanPartitaMagBeChanged(canPartitaMagBeChanged);
+                .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
+                .setCanLUBeClosed(true);
 
         DialogInputQuantityV2
                 .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java

@@ -426,8 +426,18 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                             spedizioneListModels.add(spedizioneListModel);
                         } else {
 
+                            BigDecimal qtaColOrdCounter = x.getSitArtOrdDTO().getQtaOrd();
+                            BigDecimal numCnfOrdCounter = x.getSitArtOrdDTO().getNumCnfOrd();
+
+
                             for (MtbColt mtbColtToPick : x.getMtbColts()) {
 
+                                if(UtilityBigDecimal.equalsTo(qtaColOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaColOrdCounter, BigDecimal.ZERO))
+                                break;
+
+                                if(UtilityBigDecimal.equalsTo(numCnfOrdCounter, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(numCnfOrdCounter, BigDecimal.ZERO))
+                                    break;
+
                                 SpedizioneListModel cloneModel = (SpedizioneListModel) spedizioneListModel.clone();
 
 
@@ -441,11 +451,49 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
                                 if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) {
                                     cloneModel.setUntMis("col");
-                                    cloneModel.setQtaTot(mtbColrToDispatch != null ? mtbColrToDispatch.getNumCnf() : x.getSitArtOrdDTO().getNumCnfOrd());
-                                    cloneModel.setQtaEvasa(numCnfWithdrawRows.getBigDecimalValue());
+
+                                    BigDecimal numCnfOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter);
+
+                                    BigDecimal qtaTot = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getNumCnf(), numCnfOrdCounter);
+                                    if(UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO)) continue;
+                                    cloneModel.setQtaTot(qtaTot);
+
+                                    numCnfOrdCounter = numCnfOrdCounter.subtract(numCnfOrdToSubstract);
+
+                                    BigDecimal qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                            .filter(y -> y.getRefMtbColr() != null &&
+                                                    y.getRefMtbColr().getNumCollo().equals(mtbColrToDispatch.getNumCollo()) &&
+                                                    y.getRefMtbColr().getDataColloD().equals(mtbColrToDispatch.getDataColloD()) &&
+                                                    y.getRefMtbColr().getSerCollo().equals(mtbColrToDispatch.getSerCollo()) &&
+                                                    y.getRefMtbColr().getGestioneEnum().equals(mtbColrToDispatch.getGestioneEnum()) &&
+                                                    UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodMart(), mtbColrToDispatch.getCodMart()) &&
+                                                    UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodTagl(), mtbColrToDispatch.getCodTagl()) &&
+                                                    UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol()))
+                                            .map(MtbColr::getNumCnf)
+                                            .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                                    cloneModel.setQtaEvasa(qtaEvasa);
                                 } else {
-                                    cloneModel.setQtaTot(mtbColrToDispatch != null ? mtbColrToDispatch.getQtaCol() : x.getSitArtOrdDTO().getQtaOrd());
-                                    cloneModel.setQtaEvasa(qtaColWithdrawRows.getBigDecimalValue());
+                                    BigDecimal qtaOrdToSubstract = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getQtaCol(), qtaColOrdCounter);
+
+                                    BigDecimal qtaTot = UtilityBigDecimal.getLowerBetween(mtbColrToDispatch.getQtaCol(), qtaColOrdCounter);
+                                    if(UtilityBigDecimal.equalsTo(qtaTot, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(qtaTot, BigDecimal.ZERO)) continue;
+                                    cloneModel.setQtaTot(qtaTot);
+                                    qtaColOrdCounter = qtaColOrdCounter.subtract(qtaOrdToSubstract);
+
+                                    BigDecimal qtaEvasa = Stream.of(x.getWithdrawMtbColrs())
+                                            .filter(y -> y.getRefMtbColr() != null &&
+                                                    y.getRefMtbColr().getNumCollo().equals(mtbColrToDispatch.getNumCollo()) &&
+                                                    y.getRefMtbColr().getDataColloD().equals(mtbColrToDispatch.getDataColloD()) &&
+                                                    y.getRefMtbColr().getSerCollo().equals(mtbColrToDispatch.getSerCollo()) &&
+                                                    y.getRefMtbColr().getGestioneEnum().equals(mtbColrToDispatch.getGestioneEnum()) &&
+                                                    UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodMart(), mtbColrToDispatch.getCodMart()) &&
+                                                    UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodTagl(), mtbColrToDispatch.getCodTagl()) &&
+                                                    UtilityString.equalsIgnoreCase(y.getRefMtbColr().getCodCol(), mtbColrToDispatch.getCodCol()))
+                                            .map(MtbColr::getQtaCol)
+                                            .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                                    cloneModel.setQtaEvasa(qtaEvasa);
                                     if (x.getMtbAart() != null)
                                         cloneModel.setUntMis(x.getMtbAart().getUntMis());
                                 }
@@ -671,7 +719,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 .setQtaCnfAvailable(qtaCnfAvailable)
                 .setPartitaMag(partitaMag)
                 .setDataScad(dataScad)
-                .setCanOverflowOrderQuantity(canOverflowOrderQuantity);
+                .setCanOverflowOrderQuantity(canOverflowOrderQuantity)
+                .setCanLUBeClosed(true);
 
         DialogInputQuantityV2
                 .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java

@@ -1103,7 +1103,8 @@ public class SpedizioneViewModel {
                 pickingObjectDTO.getTempPickData().getSourceMtbColt().getMtbColr().get(0) : null;
 
         if (mtbColrToDispatch != null) {
-
+            if(UtilityString.isNullOrEmpty(mCurrentMtbColt.getCodTcol()))
+                mCurrentMtbColt.setCodTcol(UtilityString.empty2null(pickingObjectDTO.getTempPickData().getSourceMtbColt().getCodTcol()));
 
             mtbColr
                     .setCodJcom(UtilityString.empty2null(mtbColrToDispatch.getCodJcom()))

app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java

@@ -473,10 +473,10 @@ public class DialogVenditaFiltroAvanzato {
 
         return Stream
                 .of(currentFilteredOrderList)
+                .filter(x -> x.getIdViaggio() != null)
+                .sortBy(x -> -x.getIdViaggio())
                 .map(x -> x.getIdViaggio() != null ? x.getIdViaggio().toString() : null)
-                .withoutNulls()
                 .distinct()
-                .sorted()
                 .toList();
     }
 

app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentView.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.view.bottom_sheet__lu_content;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
+import android.view.View;
 
 import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
@@ -14,6 +15,7 @@ import java.util.List;
 
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
+import it.integry.integrywmsnative.core.expansion.OnSingleClickListener;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.databinding.BottomSheetFragmentLuContentBinding;
 import it.integry.integrywmsnative.view.bottom_sheet__base.BottomSheetFragmentBaseView;
@@ -42,6 +44,13 @@ public class BottomSheetFragmentLUContentView extends BottomSheetFragmentBaseVie
         mBinding.bottomSheetMtbColrEdit.setListener(this);
         mBinding.bottomSheetMtbColrEdit.init(mBinding.bottomSheetMtbColrEdit, mBinding.bottomSheetMtbColrEditBackground);
 
+        mBinding.titleLayout.setOnClickListener(new OnSingleClickListener() {
+            @Override
+            public void onSingleClick(View v) {
+                toggle();
+            }
+        });
+
         this.initCallbacks();
     }
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java

@@ -77,7 +77,7 @@ public class DialogInputQuantityV2ViewModel {
             this.internalQtaTot = totalQtaOrd;
         }
 
-        this.shouldAskDataScad = mtbAart.get().isFlagQtaCnfFissaBoolean() && mtbAart.get().getGgScadPartita() != null && mtbAart.get().getGgScadPartita() > 0;
+        this.shouldAskDataScad = mtbAart.get().isFlagTracciabilitaBoolean() && mtbAart.get().getGgScadPartita() != null && mtbAart.get().getGgScadPartita() > 0;
         this.shouldShowDataScad = this.internalDataScad != null;
 
         this.blockedNumCnf.set(false);

zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java

@@ -33,6 +33,8 @@ public class ZebraBarcodeReader implements BarcodeReaderInterface {
         String model = Build.MODEL;
         if(model.equalsIgnoreCase("TC700H")) {
             return true;
+        } else if(model.equalsIgnoreCase("TC200J")) {
+            return true;
         } else return false;
     }