Merge remote-tracking branch 'origin/develop' into develop

app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java

@@ -29,6 +29,8 @@ import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.sele
 import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsModule;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleComponent;
 import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleModule;
+import it.integry.integrywmsnative.gest.articoli_in_giacenza.ArticoliInGiacenzaComponent;
+import it.integry.integrywmsnative.gest.articoli_in_giacenza.ArticoliInGiacenzaModule;
 import it.integry.integrywmsnative.gest.inventario.ElencoInventariComponent;
 import it.integry.integrywmsnative.gest.inventario.ElencoInventariModule;
 import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions.BottomSheetInventarioActionsComponent;
@@ -206,7 +208,8 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         DialogInfoAggiuntiveLUModule.class,
         DialogAskLineaProdModule.class,
         ProdRiposizionamentoDaProdModule.class,
-        DialogInfoGiacenzaModule.class
+        DialogInfoGiacenzaModule.class,
+        ArticoliInGiacenzaModule.class
 })
 public interface MainApplicationComponent {
 
@@ -346,6 +349,8 @@ public interface MainApplicationComponent {
 
     DialogInfoGiacenzaComponent.Factory dialogInfoGiacenzaComponent();
 
+    ArticoliInGiacenzaComponent.Factory controlloGiacenzeComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);

app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java

@@ -5,6 +5,7 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.gest.accettazione_bolla_elenco.MainAccettazioneBollaElencoFragment;
 import it.integry.integrywmsnative.gest.accettazione_ordini_elenco.MainAccettazioneOrdiniElencoFragment;
+import it.integry.integrywmsnative.gest.articoli_in_giacenza.ArticoliInGiacenzaFragment;
 import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniFragment;
 import it.integry.integrywmsnative.gest.inventario.ElencoInventariFragment;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment;
@@ -115,7 +116,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                 .setTitleText(R.string.prod_ordine_lavorazione_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione)
                                 .setDrawerIcon(R.drawable.ic_black_external)
-                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, null)))
+                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.PRODUZIONE, GestioneEnum.LAVORAZIONE, -1, SettingsManager.iDB().isFlagShowInfo() ? DialogInfoSituazioneArticoloView.class : null)))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_free_lav_picking)
@@ -218,6 +219,13 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setDrawerIcon(R.drawable.ic_black_empty_box)
                                         .setFragmentFactory(ElencoInventariFragment::newInstance))
 
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_articoli_in_giacenza)
+                                        .setCodMenu("MG070")
+                                        .setTitleText(R.string.articoli_in_giacenza_title)
+                                        .setTitleIcon(R.drawable.ic_dashboard_articoli_in_giacenza)
+                                        .setDrawerIcon(R.drawable.ic_black_empty_box)
+                                        .setFragmentFactory(ArticoliInGiacenzaFragment::newInstance))
 
                 ).addGroup(
                         new MenuGroup()

app/src/main/java/it/integry/integrywmsnative/core/model/MvwSitArtUdcDetInventario.java

@@ -4,6 +4,8 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 
 import it.integry.integrywmsnative.core.utility.UtilityDate;
+import it.integry.integrywmsnative.core.utility.UtilityNumber;
+import it.integry.integrywmsnative.core.utility.UtilityString;
 
 /**
  * Created by ValerioC on 06/03/2018.
@@ -292,6 +294,12 @@ public class MvwSitArtUdcDetInventario {
         return this;
     }
 
+    public String getQtaText(){
+        String text = UtilityNumber.decimalToString(this.qtaCol);
+        text += !UtilityString.isNullOrEmpty(this.untMis) ? "\n" + this.untMis : "";
+        return text;
+    }
+
     public MtbColr toMtbColr() {
         return new MtbColr()
                 .setCodJcom(getCodJcom())

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumer.java

@@ -41,27 +41,31 @@ public class GiacenzaRESTConsumer extends _BaseRESTConsumer {
             public void onResponse(Call<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> call, Response<ServiceRESTResponse<List<MvwSitArtUdcDetInventario>>> response) {
                 analyzeAnswer(response, "getGiacenzeInPosizione", inventarioList -> {
 
-                    List<String> codMarts = Stream.of(inventarioList)
-                            .map(x -> x.getCodMart().trim())
-                            .toList();
+                    if(inventarioList != null && !inventarioList.isEmpty()){
+                        List<String> codMarts = Stream.of(inventarioList)
+                                .map(x -> x.getCodMart().trim())
+                                .toList();
 
-                    mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
-                        for (var row : inventarioList) {
+                        mArticoloRESTConsumer.getByCodMarts(codMarts, mtbAarts -> {
+                            for (var row : inventarioList) {
 
-                            MtbAart foundMtbAart = null;
-                            Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
-                                    .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
-                                    .findFirst();
+                                MtbAart foundMtbAart = null;
+                                Optional<MtbAart> mtbAartOpt = Stream.of(mtbAarts)
+                                        .filter(x -> x.getCodMart().equalsIgnoreCase(row.getCodMart()))
+                                        .findFirst();
 
-                            if (mtbAartOpt.isPresent()) {
-                                foundMtbAart = mtbAartOpt.get();
+                                if (mtbAartOpt.isPresent()) {
+                                    foundMtbAart = mtbAartOpt.get();
+                                }
+
+                                row.setMtbAart(foundMtbAart);
                             }
 
-                            row.setMtbAart(foundMtbAart);
-                        }
-
-                        onComplete.run(inventarioList);
-                    }, onFailed);
+                            onComplete.run(inventarioList);
+                        }, onFailed);
+                    }else{
+                        onComplete.run(new ArrayList<>());
+                    }
                 }, onFailed);
             }
 

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java

@@ -157,6 +157,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
     }
 
     public void printClosedOrders(PrintOrderCloseDTO dto, String codMdep, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        if (BuildConfig.DEBUG) {
+            onComplete.run();
+            return;
+        }
 
         PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class, 240);
         Call<ServiceRESTResponse<Object>> callable = printerService.printClosedOrders(codMdep, dto);

app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java

@@ -74,6 +74,7 @@ public class DBSettingsModel {
     private String viewPosizioni;
     private boolean flagDeleteRowOnClose = false;
     private boolean flagAllowBarcodeFornitore = false;
+    private boolean flagShowInfo = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -606,4 +607,13 @@ public class DBSettingsModel {
         this.flagAllowBarcodeFornitore = flagAllowBarcodeFornitore;
         return this;
     }
+
+    public boolean isFlagShowInfo() {
+        return flagShowInfo;
+    }
+
+    public DBSettingsModel setFlagShowInfo(boolean flagShowInfo) {
+        this.flagShowInfo = flagShowInfo;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java

@@ -283,6 +283,12 @@ public class SettingsManager {
                 .setKeySection("FLAG_GROUP_BY_GRP_MERC")
                 .setSetter(dbSettingsModelIstance::setGroupPoductionByCommodityGroup)
                 .setDefaultValue(false));
+        stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class)
+                .setGestName("PICKING")
+                .setSection("PRODUZIONE")
+                .setKeySection("FLAG_SHOW_INFO")
+                .setSetter(dbSettingsModelIstance::setFlagShowInfo)
+                .setDefaultValue(false));
         stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class)
                 .setGestName("PICKING")
                 .setSection("PRODUZIONE")

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java

@@ -101,7 +101,9 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
     public void onBindItemViewHolder(final AccettazioneBollaPickingListAdapter.SingleItemViewHolder holder, final int position) {
         AccettazioneBollaPickingListModel pickingObjectDTO = this.mDataset.get(position);
 
-        if (pickingObjectDTO.getQtaEvasa().subtract(pickingObjectDTO.getQtaTot()).floatValue() >= 0) {
+        if (pickingObjectDTO.getQtaEvasa().subtract(pickingObjectDTO.getQtaTot()).floatValue() > 0) {
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.blue_100));
+        } else if (pickingObjectDTO.getQtaEvasa().subtract(pickingObjectDTO.getQtaTot()).floatValue() == 0) {
             holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.green_500_with_alpha));
         } else if (pickingObjectDTO.getQtaEvasa().floatValue() > 0) {
             holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));

app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.gest.articoli_in_giacenza;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface ArticoliInGiacenzaComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        ArticoliInGiacenzaComponent create();
+    }
+
+    void inject(ArticoliInGiacenzaFragment ControlloGiacenzeFragment);
+}

app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaFragment.java

@@ -0,0 +1,139 @@
+package it.integry.integrywmsnative.gest.articoli_in_giacenza;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableArrayList;
+
+import com.ravikoradiya.liveadapter.LiveAdapter;
+import com.ravikoradiya.liveadapter.Type;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.BR;
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
+import it.integry.integrywmsnative.databinding.FragmentArticoliInGiacenzaBinding;
+import it.integry.integrywmsnative.databinding.ListaGiacenzePerPosizioneModelBinding;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
+import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
+
+public class ArticoliInGiacenzaFragment extends BaseFragment implements ITitledFragment, ArticoliInGiacenzaViewModel.Listener {
+    @Inject
+    ArticoliInGiacenzaViewModel mViewModel;
+    private FragmentArticoliInGiacenzaBinding mBindings;
+    private final ObservableArrayList<MvwSitArtUdcDetInventario> mItemsInventario = new ObservableArrayList<>();
+
+    public ArticoliInGiacenzaFragment() {
+        // Required empty public constructor
+    }
+
+    public static ArticoliInGiacenzaFragment newInstance() {
+        return new ArticoliInGiacenzaFragment();
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_articoli_in_giacenza, container, false);
+
+        MainApplication.appComponent
+                .controlloGiacenzeComponent()
+                .create()
+                .inject(this);
+
+        mViewModel.setListener(this);
+        mBindings.setLifecycleOwner(this);
+        mBindings.setView(this);
+        mBindings.setViewmodel(mViewModel);
+
+        this.initRecyclerView();
+
+        return mBindings.getRoot();
+    }
+
+    private void initRecyclerView() {
+        mViewModel.getMvwSitArtUdcDetInventario().observe(getViewLifecycleOwner(), data -> {
+            mBindings.emptyView.setVisibility(data == null || data.isEmpty() ? View.VISIBLE : View.GONE);
+
+            this.refreshList(null);
+        });
+
+        var itemType = new Type<MvwSitArtUdcDetInventario, ListaGiacenzePerPosizioneModelBinding>(R.layout.lista_giacenze_per_posizione_model, BR.item);
+
+        new LiveAdapter(mItemsInventario)
+                .map(MvwSitArtUdcDetInventario.class, itemType)
+                .into(this.mBindings.inventarioList);
+    }
+
+    public void refreshList(List<MvwSitArtUdcDetInventario> filteredList) {
+        List<MvwSitArtUdcDetInventario> tmpList;
+
+        if (filteredList != null) {
+            tmpList = filteredList;
+        } else {
+            tmpList = mViewModel.getMvwSitArtUdcDetInventario().getValue();
+        }
+        this.mItemsInventario.clear();
+        if (tmpList != null) {
+            this.mItemsInventario.addAll(tmpList);
+        }
+    }
+
+    private void choosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
+        DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
+
+                    if (status == DialogConsts.Results.ABORT) {
+                        popMe();
+                    } else {
+                        onComplete.run(mtbDepoPosizione);
+                    }
+
+                }, this::onError)
+                .show(requireActivity().getSupportFragmentManager(), "tag");
+    }
+
+    @Override
+    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+        titleText.setText(context.getText(R.string.articoli_in_giacenza_title).toString());
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        mViewModel.init();
+    }
+
+    @Override
+    public void onDestroy() {
+        mViewModel.setListener(null);
+
+        for (Runnable onPreDestroy : mOnPreDestroyList) {
+            onPreDestroy.run();
+        }
+        super.onDestroy();
+    }
+
+    @Override
+    public void onRequestChoosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
+        choosePosition(onComplete);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaModule.java

@@ -0,0 +1,16 @@
+package it.integry.integrywmsnative.gest.articoli_in_giacenza;
+
+import dagger.Module;
+import dagger.Provides;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
+import it.integry.integrywmsnative.core.services.inventario.InventarioService;
+
+@Module(subcomponents = ArticoliInGiacenzaComponent.class)
+public class ArticoliInGiacenzaModule {
+
+    @Provides
+    ArticoliInGiacenzaViewModel providesControlloGiacenzeViewModel(InventarioService inventarioService) {
+        return new ArticoliInGiacenzaViewModel(inventarioService);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaViewModel.java

@@ -0,0 +1,69 @@
+package it.integry.integrywmsnative.gest.articoli_in_giacenza;
+
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.exception.ScannedPositionNotExistException;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario;
+import it.integry.integrywmsnative.core.services.inventario.InventarioService;
+import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.ArtsInGiacenzaDTO;
+
+public class ArticoliInGiacenzaViewModel {
+    private final InventarioService mInventarioService;
+    private final MutableLiveData<List<MvwSitArtUdcDetInventario>> mvwSitArtUdcDetInventario = new MutableLiveData<>();
+    private Listener mListener;
+
+    public ArticoliInGiacenzaViewModel(InventarioService inventarioService){
+        this.mInventarioService = inventarioService;
+    }
+
+    public void init() {
+        this.sendRequestChoosePosition(this::setPosizione);
+    }
+
+    private void setPosizione(MtbDepoPosizione posizione){
+        if (posizione == null) {
+            //Nessuna posizione trovata con questo barcode
+            this.sendError(new ScannedPositionNotExistException());
+        }else{
+            this.sendOnLoadingStarted();
+            mInventarioService.getInventarioDaPosizione(posizione, inventario -> {
+                mvwSitArtUdcDetInventario.postValue(inventario);
+                this.sendOnLoadingEnded();
+            }, this::sendError);
+        }
+    }
+
+    public MutableLiveData<List<MvwSitArtUdcDetInventario>> getMvwSitArtUdcDetInventario() {
+        return mvwSitArtUdcDetInventario;
+    }
+
+    public void setListener(Listener listener) {
+        this.mListener = listener;
+    }
+
+    private void sendError(Exception ex) {
+        if (this.mListener != null) mListener.onError(ex);
+    }
+
+    private void sendRequestChoosePosition(RunnableArgs<MtbDepoPosizione> onComplete) {
+        if (this.mListener != null) mListener.onRequestChoosePosition(onComplete);
+    }
+
+    private void sendOnLoadingStarted() {
+        if (this.mListener != null) mListener.onLoadingStarted();
+    }
+
+    private void sendOnLoadingEnded() {
+        if (this.mListener != null) mListener.onLoadingEnded();
+    }
+
+    public interface Listener extends ILoadingListener {
+        void onError(Exception ex);
+        void onRequestChoosePosition(RunnableArgs<MtbDepoPosizione> onComplete);
+    }
+}