提交 0ea89cde authored 作者: lgd's avatar lgd

1.仓库,仓库订单搜索

2.//TODO erp用户激活,忘记密码测试,产品下单还差附件,bat,mes,消息,我的,刷新token
上级 f1fdc209
......@@ -353,6 +353,23 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkWarehouseOrderSearchActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkWarehouseSearchActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
......@@ -8,8 +8,8 @@ public interface Config {
String REGEX_USERNAME = "^[\\w]{4,16}(?<!_)$";
String REGEX_PASSWORD = "^[\\w]{6,16}(?<!_)$";
List<String> warehouseStatusList = Arrays.asList("全部状态", "销售订单", "外采购流程",
int SIZE = 10;
List<String> warehouseStatusList = Arrays.asList("全部类型", "销售订单", "外采购流程",
"供应订单", "坩埚订单", "内部交易订单", "组装订单");
List<String> warehouseCodeList = Arrays.asList("全部状态", "SO", "PO",
"FO", "CO", "IO", "AO");
......
package com.wd.workoffice.bean.listener;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public interface WarehouseOrderclickListener {
void click(String value);
}
......@@ -31,7 +31,9 @@ public class WorkWarehouseActivity extends WorkToolBarActivity {
TabLayout tlTab;
@BindView(R.id.vp_data)
ViewPager vpData;
private String tab[] = {"仓库列表", "订单列表",};
private String tab[] = {"仓库列表", "订单列表"};
int choosePos = 0;
@Override
protected void initView() {
ButterKnife.bind(this);
......@@ -55,6 +57,22 @@ public class WorkWarehouseActivity extends WorkToolBarActivity {
@Override
protected void initEvent() {
tlTab.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
choosePos = tab.getPosition();
}
@Override
public void onTabUnselected(TabLayout.Tab tab) {
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
}
});
}
@Override
......@@ -72,7 +90,11 @@ public class WorkWarehouseActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
// startActivity(WorkProSearchActivity.class);
if (choosePos == 0) {
startActivity(WorkWarehouseSearchActivity.class);
} else {
startActivity(WorkWarehouseOrderSearchActivity.class);
}
break;
}
return super.onOptionsItemSelected(item);
......
package com.wd.workoffice.ui.activity.bat.work;
import android.content.Context;
import android.text.TextUtils;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.popup.QMUIPopup;
import com.qmuiteam.qmui.widget.popup.QMUIPopups;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.WarehoustBean;
import com.wd.workoffice.bean.listener.WarehouseOrderclickListener;
import com.wd.workoffice.contract.WorkWarehouseContract;
import com.wd.workoffice.presenter.WorkWarehousePresenter;
import com.wd.workoffice.ui.adapter.FilterBaseAdapter;
import com.wd.workoffice.ui.adapter.WorkWarehouseOrderAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 仓库订单搜索
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkWarehouseOrderSearchActivity extends WorkBaseActivity implements WorkWarehouseContract.View {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.tb_title)
Toolbar tbTitle;
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.tv_type)
TextView tvType;
@BindView(R.id.tv_search)
TextView tvSearch;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private int page = 1;
private Map<String, Object> param;
private WorkWarehousePresenter workProPresenter;
private WorkWarehouseOrderAdapter workProductAdapter;
private List<OrderBean> dataList;
private QMUIPopup popup;
private FilterBaseAdapter filterBaseAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
workProPresenter = new WorkWarehousePresenter();
workProPresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void initData() {
param = WorkUtils.pageKey();
page = 1;
param.put("current", page);
dataList = new ArrayList<>();
workProductAdapter = new WorkWarehouseOrderAdapter(R.layout.item_work_warehouse_order, dataList);
workProductAdapter.bindToRecyclerView(rvData);
workProductAdapter.setEmptyView(R.layout.view_empty_content, rvData);
filterBaseAdapter = new FilterBaseAdapter();
popup = topPopInit(this);
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
workProPresenter.getOrder(param);
});
workProductAdapter.setOnLoadMoreListener(() -> {
param.put("current", page);
workProPresenter.getOrder(param);
}, rvData);
workProductAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkProDetailActivity.class, "pro", JSON.toJSONString(dataList.get(position)));
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_warehouse_sorder_earch;
}
@Override
public void getWarehouse(List<WarehoustBean.RecordsBean> data) {
}
@Override
public void getOrder(List<OrderBean> data) {
if (page == 1) {
dataList.clear();
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
workProductAdapter.loadMoreComplete();
srlRefresh.finishRefresh();
} else {
workProductAdapter.loadMoreComplete();
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
}
if (data.size() == 0) {
workProductAdapter.loadMoreEnd();
} else {
page++;
}
}
@OnClick({R.id.tv_type, R.id.tv_search})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_type:
popup.show(tbTitle);
break;
case R.id.tv_search:
String key = etKey.getText().toString();
if (TextUtils.isEmpty(key)) {
toast("请输入搜索关键字");
return;
}
page = 1;
param.put("current", page);
param.put("id", key);
workProPresenter.getOrder(param);
break;
}
}
public QMUIPopup topPopInit(Context context) {
popup = QMUIPopups.listPopup(context,
ViewGroup.LayoutParams.MATCH_PARENT,
QMUIDisplayHelper.dp2px(context, 300), filterBaseAdapter
,
(parent, view, position, id) -> {
filterBaseAdapter.setChoosePos(position);
filterBaseAdapter.notifyDataSetChanged();
tvType.setText(Config.warehouseStatusList.get(position));
popup.dismiss();
page = 1;
param.put("current", page);
param.put("orderType", Config.warehouseCodeList.get(position));
workProPresenter.getOrder(param);
})
.animStyle(QMUIPopup.ANIM_GROW_FROM_CENTER)
.preferredDirection(QMUIPopup.DIRECTION_TOP)
.shadow(true)
.edgeProtection(QMUIDisplayHelper.dp2px(context, 10))
.offsetYIfTop(QMUIDisplayHelper.dp2px(context, 5));
return popup;
}
}
package com.wd.workoffice.ui.activity.bat.work;
import android.text.TextUtils;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.WarehoustBean;
import com.wd.workoffice.contract.WorkWarehouseContract;
import com.wd.workoffice.presenter.WorkWarehousePresenter;
import com.wd.workoffice.ui.adapter.WorkWarehouseAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 仓库搜索
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkWarehouseSearchActivity extends WorkBaseActivity implements WorkWarehouseContract.View {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.tb_title)
Toolbar tbTitle;
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private int page = 1;
private Map<String, Object> param;
private WorkWarehousePresenter workProPresenter;
private WorkWarehouseAdapter workProductAdapter;
private List<WarehoustBean.RecordsBean> dataList;
@Override
protected void initView() {
ButterKnife.bind(this);
workProPresenter = new WorkWarehousePresenter();
workProPresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void initData() {
param = WorkUtils.pageKey();
page = 1;
param.put("current", page);
param.put("searchKey", "name");
dataList = new ArrayList<>();
workProductAdapter = new WorkWarehouseAdapter(R.layout.item_work_warehouse, dataList);
workProductAdapter.bindToRecyclerView(rvData);
workProductAdapter.setEmptyView(R.layout.view_empty_content, rvData);
// workProPresenter.getWarehouse(param);
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
workProPresenter.getWarehouse(param);
});
workProductAdapter.setOnLoadMoreListener(() -> {
param.put("current", page);
workProPresenter.getWarehouse(param);
}, rvData);
workProductAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkProDetailActivity.class, "pro", JSON.toJSONString(dataList.get(position)));
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_warehouse_search;
}
@OnClick(R.id.iv_search)
public void onViewClicked() {
String key = etKey.getText().toString();
if (TextUtils.isEmpty(key)) {
toast("请输入搜索关键字");
return;
}
page = 1;
param.put("current", page);
param.put("searchValue", key);
workProPresenter.getWarehouse(param);
}
@Override
public void getWarehouse(List<WarehoustBean.RecordsBean> data) {
if (page == 1) {
dataList.clear();
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
workProductAdapter.loadMoreComplete();
srlRefresh.finishRefresh();
} else {
workProductAdapter.loadMoreComplete();
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
}
if (data.size() == 0) {
workProductAdapter.loadMoreEnd();
} else {
page++;
}
}
@Override
public void getOrder(List<OrderBean> dataList) {
}
}
package com.wd.workoffice.ui.adapter;
import android.graphics.Color;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.app.Config;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class FilterBaseAdapter extends BaseAdapter {
int choosePos = 0;
@Override
public int getCount() {
return Config.warehouseStatusList.size();
}
@Override
public Object getItem(int position) {
return Config.warehouseStatusList.get(position);
}
@Override
public long getItemId(int position) {
return position;
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
if (convertView == null) {
convertView = LayoutInflater.from(parent.getContext()).inflate(
R.layout.item_filter, parent, false);
}
TextView result = convertView.findViewById(R.id.tv_name);
if (position == choosePos) {
result.setBackgroundColor(Color.parseColor("#ffeaf3fe"));
result.setTextColor(Color.parseColor("#2F89FC"));
} else {
result.setTextColor(parent.getContext().getResources().
getColor(R.color.flexible_text_color));
result.setBackgroundColor(Color.WHITE);
}
result.setText(Config.warehouseStatusList.get(position));
return convertView;
}
public int getChoosePos() {
return choosePos;
}
public void setChoosePos(int choosePos) {
this.choosePos = choosePos;
}
}
......@@ -50,7 +50,6 @@ public class WorkWarehouse1Fragment extends WorkBaseFg implements WorkWarehouseC
@BindView(R.id.ddm_choose)
DropDownMenu ddmChoose;
private String ofKind;
private RecyclerView rvData;
private int page = 1;
private Map<String, Object> param;
......
package com.wd.workoffice.util;
import android.content.Context;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.popup.QMUIPopup;
import com.qmuiteam.qmui.widget.popup.QMUIPopups;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.bean.listener.WarehouseOrderclickListener;
import com.wd.workoffice.ui.adapter.FilterBaseAdapter;
import androidx.appcompat.app.AlertDialog;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* author : flexible
......@@ -19,13 +25,20 @@ import androidx.appcompat.app.AlertDialog;
* github: https://github.com/FlexibleXd
**/
public class DialogUtils {
public static QMUIDialog.MenuDialogBuilder listDialog(Context context) {
QMUIDialog.MenuDialogBuilder dialog = new QMUIDialog.MenuDialogBuilder(context);
return dialog;
}
public static QMUIDialog.MessageDialogBuilder okAndCancelDialog(Context context) {
QMUIDialog.MessageDialogBuilder dialog = new QMUIDialog.MessageDialogBuilder(context);
return dialog;
}
}
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tb_title"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Light"
app:contentInsetEnd="0mm"
app:contentInsetEndWithActions="0mm"
app:contentInsetLeft="0mm"
app:contentInsetRight="0mm"
app:contentInsetStart="0mm"
app:contentInsetStartWithNavigation="0mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingVertical="5mm">
<EditText
android:id="@+id/et_key"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginVertical="3mm"
android:layout_weight="1"
android:background="@drawable/shape_client_search"
android:hint="搜索仓库名称"
android:paddingHorizontal="3mm"
android:textSize="14sp" />
<TextView
android:id="@+id/iv_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:paddingHorizontal="8mm"
android:text="搜索" />
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
<View style="@style/dividerX" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tb_title"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Light"
app:contentInsetEnd="0mm"
app:contentInsetEndWithActions="0mm"
app:contentInsetLeft="0mm"
app:contentInsetRight="0mm"
app:contentInsetStart="0mm"
app:contentInsetStartWithNavigation="0mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingVertical="5mm">
<TextView
android:id="@+id/tv_type"
android:layout_width="100mm"
android:layout_height="wrap_content"
android:drawableRight="@mipmap/arrow_down"
android:gravity="center_vertical"
android:textSize="13sp"
android:text="全部类型"
android:textColor="@color/flexible_text_gray" />
<EditText
android:id="@+id/et_key"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginVertical="3mm"
android:layout_weight="1"
android:background="@drawable/shape_client_search"
android:hint="搜索订单编号"
android:paddingHorizontal="3mm"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:paddingHorizontal="8mm"
android:text="搜索" />
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
<View style="@style/dividerX" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论