From adde82c19189e09d076d581c69aac6cf5c3183dd Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 4 Mar 2021 18:27:42 +0100 Subject: [PATCH] Fix su dialogFragment --- .../core/expansion/BaseDialogFragment.java | 12 ++- .../AccettazionePickingActivity.java | 2 +- .../gest/spedizione/SpedizioneActivity.java | 9 ++- .../gest/spedizione/SpedizioneViewModel.java | 74 ++++++++----------- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/xml/app_preferences.xml | 10 ++- 6 files changed, 61 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java index 5c7fc6d2..5887cbe3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java @@ -1,8 +1,12 @@ package it.integry.integrywmsnative.core.expansion; import android.app.Dialog; +import android.os.Bundle; import android.view.KeyEvent; +import android.view.View; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; @@ -15,6 +19,13 @@ public class BaseDialogFragment extends DialogFragment { public BaseDialogFragment() { super(); + } + + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator()) { getDialog().setOnKeyListener((dialog, keyCode, event) -> { if (mBarcodeListener && (event.getAction() == KeyEvent.ACTION_DOWN || event.getAction() == KeyEvent.ACTION_MULTIPLE) && !isControlKey(event)) { @@ -25,7 +36,6 @@ public class BaseDialogFragment extends DialogFragment { } } - private boolean isControlKey(KeyEvent keyEvent) { int keyCode = keyEvent.getKeyCode(); return ( diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java index e88a2ea2..77621f8e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java @@ -120,7 +120,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta setSupportActionBar(this.mBindings.toolbar); SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - mShowSecondaryUntMis = sharedPreferences.getBoolean("picking_enable_sec_unt_mis", true); + mShowSecondaryUntMis = sharedPreferences.getBoolean("picking_ingresso_enable_sec_unt_mis", true); this.initVars(); this.initBarcodeReader(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index 06b37c37..2aa9f89b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -2,12 +2,14 @@ package it.integry.integrywmsnative.gest.spedizione; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Bundle; import android.text.SpannableString; import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; +import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.LinearLayoutManager; import com.annimon.stream.Stream; @@ -94,6 +96,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo private boolean mEnableGiacenza; private boolean mFlagShowCodForn; private boolean mDivideByGrpMerc; + private boolean mEnableQuantityReset; private int barcodeScannerIstanceID = -1; private ArrayList mSitArtOrd; @@ -170,6 +173,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo mFlagShowCodForn = customConfiguration.getConfig(BaseCustomConfiguration.Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE); mDivideByGrpMerc = customConfiguration.getConfig(BaseCustomConfiguration.Keys.FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC); + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + mEnableQuantityReset = sharedPreferences.getBoolean("picking_uscita_enable_quantity_reset", true); + mBindings.setLifecycleOwner(this); mBindings.setSpedizioneView(this); @@ -204,7 +210,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo mTestateOrdini, mColliRegistrati, reportNameSpedizioneChiudiOrdine, - mGestioneCol, mSegnoCol, mDefaultCausaleUL); + mGestioneCol, mSegnoCol, mDefaultCausaleUL, + mEnableQuantityReset); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 392146a7..2a4fd6c5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -94,6 +94,7 @@ public class SpedizioneViewModel { private boolean mShouldAskPesoLU; private String mReportNameSpedizioneChiudiOrdine; private boolean mIsNewLU; + private boolean mEnableQuantityReset; private MtbColt mCurrentMtbColt = null; @@ -135,7 +136,8 @@ public class SpedizioneViewModel { String reportNameSpedizioneChiudiOrdine, GestioneEnum gestioneCol, int segnoCol, - Integer defaultCausaleUL) { + Integer defaultCausaleUL, + boolean enableQuantityReset) { this.sendOnLoadingStarted(); this.mDefaultCodMdep = codMdep; @@ -147,6 +149,7 @@ public class SpedizioneViewModel { this.mShouldAskPesoLU = shouldAskPesoLU; this.mReportNameSpedizioneChiudiOrdine = reportNameSpedizioneChiudiOrdine; this.mDefaultCausaleOfUL = defaultCausaleUL; + this.mEnableQuantityReset = enableQuantityReset; if (enableGiacenza) { mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> { @@ -1674,59 +1677,44 @@ public class SpedizioneViewModel { this.mCurrentMtbColt = null; - for (PickingObjectDTO pickingObjectDTO : mPickingList.getValue()) { + if(mEnableQuantityReset) { + for (PickingObjectDTO pickingObjectDTO : mPickingList.getValue()) { - List withdrawMtbColrList = pickingObjectDTO.getWithdrawMtbColrs(); + List withdrawMtbColrList = pickingObjectDTO.getWithdrawMtbColrs(); - for (MtbColr withdrawMtbColr : withdrawMtbColrList) { - pickingObjectDTO.getSitArtOrdDTO().setNumCnfOrd(pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd().subtract(withdrawMtbColr.getNumCnf())); - pickingObjectDTO.getSitArtOrdDTO().setQtaOrd(pickingObjectDTO.getSitArtOrdDTO().getQtaOrd().subtract(withdrawMtbColr.getQtaCol())); + for (MtbColr withdrawMtbColr : withdrawMtbColrList) { + pickingObjectDTO.getSitArtOrdDTO().setNumCnfOrd(pickingObjectDTO.getSitArtOrdDTO().getNumCnfOrd().subtract(withdrawMtbColr.getNumCnf())); + pickingObjectDTO.getSitArtOrdDTO().setQtaOrd(pickingObjectDTO.getSitArtOrdDTO().getQtaOrd().subtract(withdrawMtbColr.getQtaCol())); - if (pickingObjectDTO.getMtbColts() != null) { + if (pickingObjectDTO.getMtbColts() != null) { - Optional optionalMtbColrReference = Stream.of(pickingObjectDTO.getMtbColts()) - .filter(y -> withdrawMtbColr.getRefMtbColr() != null && - withdrawMtbColr.getRefMtbColr().getNumCollo().equals(y.getNumCollo()) && - withdrawMtbColr.getRefMtbColr().getDataColloD().equals(y.getDataColloD()) && - withdrawMtbColr.getRefMtbColr().getSerCollo().equals(y.getSerCollo()) && - withdrawMtbColr.getRefMtbColr().getGestioneEnum().equals(y.getGestioneEnum()) && - UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodMart(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodMart() : null) && - UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodTagl(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodTagl() : null) && - UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodCol(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodCol() : null)) - .map(y -> y.getMtbColr().get(0)) - .findFirst(); + Optional optionalMtbColrReference = Stream.of(pickingObjectDTO.getMtbColts()) + .filter(y -> withdrawMtbColr.getRefMtbColr() != null && + withdrawMtbColr.getRefMtbColr().getNumCollo().equals(y.getNumCollo()) && + withdrawMtbColr.getRefMtbColr().getDataColloD().equals(y.getDataColloD()) && + withdrawMtbColr.getRefMtbColr().getSerCollo().equals(y.getSerCollo()) && + withdrawMtbColr.getRefMtbColr().getGestioneEnum().equals(y.getGestioneEnum()) && + UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodMart(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodMart() : null) && + UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodTagl(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodTagl() : null) && + UtilityString.equalsIgnoreCase(withdrawMtbColr.getRefMtbColr().getCodCol(), y.getMtbColr() != null && y.getMtbColr().size() > 0 ? y.getMtbColr().get(0).getCodCol() : null)) + .map(y -> y.getMtbColr().get(0)) + .findFirst(); - if (optionalMtbColrReference.isPresent()) { - //looking for real refMtbColr instance - MtbColr mtbColr = optionalMtbColrReference.get(); + if (optionalMtbColrReference.isPresent()) { + //looking for real refMtbColr instance + MtbColr mtbColr = optionalMtbColrReference.get(); + + mtbColr.setNumCnf(mtbColr.getNumCnf().subtract(withdrawMtbColr.getNumCnf())); + mtbColr.setQtaCol(mtbColr.getQtaCol().subtract(withdrawMtbColr.getQtaCol())); + } - mtbColr.setNumCnf(mtbColr.getNumCnf().subtract(withdrawMtbColr.getNumCnf())); - mtbColr.setQtaCol(mtbColr.getQtaCol().subtract(withdrawMtbColr.getQtaCol())); } - -// Stream.of(pickingObjectDTO.getMtbColts()) -// .filter(x -> Objects.equals(x.getNumCollo(), withdrawMtbColr.getNumColloRif()) && -// x.getDataColloS().equals(withdrawMtbColr.getDataColloRifS()) && -// x.getSerCollo().equalsIgnoreCase(withdrawMtbColr.getSerColloRif()) && -// x.getGestione().equalsIgnoreCase(withdrawMtbColr.getGestioneRif())) -// .forEach(x -> { -// List mtbColrList = x.getMtbColr(); - -// Stream.of(mtbColrList) -// .filter(y -> y.getCodMart().equalsIgnoreCase(withdrawMtbColr.getCodMart()) && -// UtilityString.equalsIgnoreCase(y.getPartitaMag(), withdrawMtbColr.getPartitaMag()) && -// UtilityString.equalsIgnoreCase(y.getCodCol(), withdrawMtbColr.getCodCol()) && -// UtilityString.equalsIgnoreCase(y.getCodTagl(), withdrawMtbColr.getCodTagl())) -// .for - - -// }); } - } - pickingObjectDTO.setWithdrawMtbColrs(new ArrayList<>()); + pickingObjectDTO.setWithdrawMtbColrs(new ArrayList<>()); + } } this.mIsNewLU = false; diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a56542ef..7bdd8894 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -19,7 +19,7 @@ Ordini di accettazione Spedizione Rettifica giacenze - Approvv. linee prod. + Approvvig. linee prod. Posizionamento merce Errore Ops diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml index 4f3eef8a..6106853a 100644 --- a/app/src/main/res/xml/app_preferences.xml +++ b/app/src/main/res/xml/app_preferences.xml @@ -5,10 +5,18 @@ app:title="@string/accettazione_title_fragment"/> + + + +