Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Aggiornate icone della dashboard.

Browse Source 
Piccoli fix su Versamento Materiale Produzione.
This commit is contained in:
Giuseppe Scorrano
2019-05-23 09:09:39 +02:00
parent cc7b512506
commit a638aa0405
34 changed files with 645 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/it/integry/integrywmsnative/MainActivity.java
View File

@@ -35,6 +35,7 @@ import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
import it.integry.integrywmsnative.gest.login.LoginActivity;
import it.integry.integrywmsnative.gest.main.MainFragment;
import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
@@ -74,7 +75,7 @@ public class MainActivity extends AppCompatActivity
mBinding.navView.setNavigationItemSelectedListener(this);
mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
pop();
openMain();
init();
}
@@ -99,8 +100,8 @@ public class MainActivity extends AppCompatActivity
if (count == 0) {
super.onBackPressed();
} else {
//pop();
getSupportFragmentManager().popBackStack();
pop();
// getSupportFragmentManager().popBackStack();
}
}
@@ -156,6 +157,9 @@ public class MainActivity extends AppCompatActivity
else if (id == R.id.nav_prod_versamento_materiale) {
fragment = ProdVersamentoMaterialeFragment.newInstance();
this.adaptViewToFragment(fragment);
} else if (id == R.id.nav_prod_recupero_materiale) {
fragment = ProdRecuperoMaterialeFragment.newInstance();
this.adaptViewToFragment(fragment);
}
else if(id == R.id.nav_settings){
@@ -177,8 +181,8 @@ public class MainActivity extends AppCompatActivity
return true;
}
@Override
public void pop() {
private void openMain() {
MainFragment mainFragment = MainFragment.newInstance();
adaptViewToFragment(mainFragment);
@@ -187,6 +191,18 @@ public class MainActivity extends AppCompatActivity
mBinding.navView.setCheckedItem(R.id.nav_home);
}
@Override
public void pop() {
int count = getSupportFragmentManager().getBackStackEntryCount();
for(int i = 0; i < count; i++) {
getSupportFragmentManager().popBackStack();
}
openMain();
}
private void adaptViewToFragment(Fragment fragment){
if(fragment instanceof ISearcableFragment) {
mBinding.appBarMain.mainSearch.setOnQueryTextListener((SearchView.OnQueryTextListener) fragment);

1
app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java
View File

@@ -140,6 +140,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer{
.setDataCollo((String) null)
.setSegno(-1)
.setGestione(GestioneEnum.LAVORAZIONE)
.setDataVers(null)
.setOperation(CommonModelConsts.OPERATION.INSERT);
if(posizione != null) {

5
app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
View File

@@ -229,6 +229,11 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
((MainActivity) getActivity()).setItem(R.id.nav_prod_versamento_materiale);
}
// @OnClick(R.id.fast_button_prod_recupero_materiale)
// public void onClickProdRecuperoMateriale(View view) {
// ((MainActivity) getActivity()).setItem(R.id.nav_prod_recupero_materiale);
// }
@Override
public void setScrollToolbar(ElevatedToolbar toolbar) {
mToolbar = toolbar;

91
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java Normal file
View File

@@ -0,0 +1,91 @@
package it.integry.integrywmsnative.gest.prod_recupero_materiale;
import android.content.Context;
import android.os.Bundle;
import androidx.appcompat.widget.AppCompatTextView;
import androidx.databinding.DataBindingUtil;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
import it.integry.integrywmsnative.databinding.FragmentProdRecuperoMaterialeBinding;
import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.ProdRecuperoMaterialeHelper;
import it.integry.integrywmsnative.gest.prod_recupero_materiale.viewmodel.ProdRecuperoMaterialeViewModel;
import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
import it.integry.integrywmsnative.gest.prod_versamento_materiale.core.ProdVersamentoMaterialHelper;
import it.integry.integrywmsnative.gest.prod_versamento_materiale.viewmodel.ProdVersamentoMaterialViewModel;
/**
* A simple {@link Fragment} subclass.
*/
public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFragment {
private FragmentProdRecuperoMaterialeBinding mBinding;
private ProdRecuperoMaterialeViewModel mViewmodel;
private ProdRecuperoMaterialeHelper mHelper;
public ProdRecuperoMaterialeFragment() {
// Required empty public constructor
}
public static ProdRecuperoMaterialeFragment newInstance() {
ProdRecuperoMaterialeFragment fragment = new ProdRecuperoMaterialeFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mViewmodel = new ProdRecuperoMaterialeViewModel();
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_recupero_materiale, container, false);
init();
return mBinding.getRoot();
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
}
@Override
public void onDetach() {
super.onDetach();
}
private void init() {
mHelper = new ProdRecuperoMaterialeHelper(getActivity());
mViewmodel.init(getActivity(), mBinding, mHelper, () -> {
((IPoppableActivity) getActivity()).pop();
});
mViewmodel.openLU();
}
@Override
public void onCreateActionBar(AppCompatTextView titleText, Context context) {
titleText.setText(context.getText(R.string.prod_recupero_materiale_title_fragment).toString());
}
}

13
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java Normal file
View File

@@ -0,0 +1,13 @@
package it.integry.integrywmsnative.gest.prod_recupero_materiale.core;
import android.content.Context;
public class ProdRecuperoMaterialeHelper {
private Context mContext;
public ProdRecuperoMaterialeHelper(Context context) {
this.mContext = context;
}
}

86
app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java Normal file
View File

@@ -0,0 +1,86 @@
package it.integry.integrywmsnative.gest.prod_recupero_materiale.viewmodel;
import android.app.Activity;
import android.content.Context;
import android.text.Html;
import android.text.SpannableString;
import androidx.databinding.ObservableField;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.databinding.FragmentProdRecuperoMaterialeBinding;
import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.ProdRecuperoMaterialeHelper;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU;
public class ProdRecuperoMaterialeViewModel {
private Context mContext;
private FragmentProdRecuperoMaterialeBinding mBinding;
private ProdRecuperoMaterialeHelper mHelper;
private Runnable mOnRecuperoCompleted;
public ObservableField<MtbColt> mtbColt = new ObservableField<>();
public void init(Activity context, FragmentProdRecuperoMaterialeBinding binding, ProdRecuperoMaterialeHelper helper, Runnable onRecuperoCompleted) {
mContext = context;
mBinding = binding;
mHelper = helper;
mOnRecuperoCompleted = onRecuperoCompleted;
BarcodeManager.enable();
}
public void openLU() {
DialogScanOrCreateLU.make(mContext, true, mtbColt -> {
if(mtbColt == null) {
((IPoppableActivity)mContext).pop();
} else if((mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(-1)){
if(mtbColt.getMtbColr() == null || mtbColt.getMtbColr().size() == 0) {
DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml("E' stata scansionata una UL già vuota")),
null, this::openLU).show();
} else {
setMtbColt(mtbColt);
// choosePosition();
}
} else {
DialogSimpleMessageHelper.makeWarningDialog(mContext,
new SpannableString(Html.fromHtml("Sono accettate solamente UL di <b>Lavorazione</b> di <b>SCARICO</b>")),
null, this::openLU).show();
}
}).show();
}
public void setMtbColt(MtbColt mtbColt) {
this.mtbColt.set(mtbColt);
}
public void resetMtbColt() {
this.mtbColt.set(null);
openLU();
}
private void showDataSavedDialog(Runnable onPositiveClick) {
DialogSimpleMessageHelper.makeSuccessDialog(
mContext,
mContext.getResources().getString(R.string.completed),
new SpannableString(mContext.getResources().getString(R.string.data_saved)),
null, onPositiveClick).show();
}
}