1.4个页面搜索

2.//TODO erp用户激活，忘记密码测试，bat，mes，消息，我的，刷新token

app/src/main/AndroidManifest.xml

@@ -98,7 +98,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.StoreSaleActivity"
+            android:name=".ui.activity.bat.store.StoreSaleActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="下单"
             android:launchMode="singleTop"
@@ -106,7 +106,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.StoreSaleClientActivity"
+            android:name=".ui.activity.bat.store.StoreSaleClientActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="选择客户"
             android:launchMode="singleTop"
@@ -114,7 +114,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.StoreSaleProductActivity"
+            android:name=".ui.activity.bat.store.StoreSaleProductActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="选择产品"
             android:launchMode="singleTop"
@@ -122,7 +122,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.StoreSaleCarActivity"
+            android:name=".ui.activity.bat.store.StoreSaleCarActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="购物车"
             android:launchMode="singleTop"
@@ -130,7 +130,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.StoreSaleConfirmActivity"
+            android:name=".ui.activity.bat.store.StoreSaleConfirmActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="确认下单"
             android:launchMode="singleTop"
@@ -138,7 +138,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.StoreOutsourcingActivity"
+            android:name=".ui.activity.bat.store.StoreOutsourcingActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="下单"
             android:launchMode="singleTop"
@@ -146,7 +146,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.StoreSupplierActivity"
+            android:name=".ui.activity.bat.store.StoreSupplierActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="下单"
             android:launchMode="singleTop"
@@ -154,7 +154,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.StoreCrucibleActivity"
+            android:name=".ui.activity.bat.store.StoreCrucibleActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="下单"
             android:launchMode="singleTop"
@@ -162,7 +162,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.StoreTradingActivity"
+            android:name=".ui.activity.bat.store.StoreTradingActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="下单"
             android:launchMode="singleTop"

app/src/main/java/com/wd/workoffice/ui/activity/bat/InsideOrderSearchActivity.java

+package com.wd.workoffice.ui.activity.bat;
+
+import android.text.TextUtils;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkBaseActivity;
+import com.wd.workoffice.bean.SaleOrderBean;
+import com.wd.workoffice.contract.SaleSaleContract;
+import com.wd.workoffice.presenter.SaleSalePresenter;
+import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
+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 InsideOrderSearchActivity extends WorkBaseActivity implements SaleSaleContract.View {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.iv_search)
+    ImageView ivSearch;
+    @BindView(R.id.tb_title)
+    Toolbar tbTitle;
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    private SaleSalePresenter saleSalePresenter;
+    private Map<String, Object> param;
+    private List<SaleOrderBean> orderList;
+    private SaleInsideAdapter orderAdapter;
+    private int page = 1;
+    private String identity;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        saleSalePresenter = new SaleSalePresenter();
+        saleSalePresenter.onAttach(this);
+        setSupportActionBar(tbTitle);
+    }
+
+    @Override
+    protected void initData() {
+        identity=getIntent().getStringExtra("identity");
+        rvData.setLayoutManager(new LinearLayoutManager(this,RecyclerView.VERTICAL,false));
+        orderList = new ArrayList<>();
+        orderAdapter = new SaleInsideAdapter(R.layout.item_sale_inside, orderList);
+        orderAdapter.bindToRecyclerView(rvData);
+        param = WorkUtils.pageKey();
+        param.put("current", page);
+        param.put("identity",  identity);
+    }
+
+    @Override
+    protected void initEvent() {
+        orderAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("current", page);
+                saleSalePresenter.getInsideOrder(param);
+            }
+        }, rvData);
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_order_serarch;
+    }
+
+
+    @OnClick(R.id.iv_search)
+    public void onViewClicked() {
+        String key = etKey.getText().toString();
+        if (TextUtils.isEmpty(key)){
+            toast("请输入搜索关键字");
+            return;
+        }
+        param.put("searchValue",  key);
+        saleSalePresenter.getInsideOrder(param);
+    }
+
+    @Override
+    public void saleList(List<SaleOrderBean> dataList) {
+
+    }
+
+    @Override
+    public void outList(List<SaleOrderBean> dataList) {
+
+    }
+
+    @Override
+    public void insideList(List<SaleOrderBean> dataList) {
+        if (page == 1) {
+            orderList.clear();
+            orderList.addAll(dataList);
+            orderAdapter.notifyDataSetChanged();
+            orderAdapter.loadMoreComplete();
+        } else {
+            orderAdapter.loadMoreComplete();
+            orderList.addAll(dataList);
+            orderAdapter.notifyDataSetChanged();
+        }
+        if (dataList.size() == 0) {
+            orderAdapter.loadMoreEnd();
+        } else {
+            page++;
+        }
+    }
+
+    @Override
+    public void supplierList(List<SaleOrderBean> dataList) {
+
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/OutOrderSearchActivity.java

+package com.wd.workoffice.ui.activity.bat;
+
+import android.text.TextUtils;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkBaseActivity;
+import com.wd.workoffice.bean.SaleOrderBean;
+import com.wd.workoffice.contract.SaleSaleContract;
+import com.wd.workoffice.presenter.SaleSalePresenter;
+import com.wd.workoffice.ui.adapter.ProOutAdapter;
+import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
+import com.wd.workoffice.ui.adapter.SaleOutAdapter;
+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 OutOrderSearchActivity extends WorkBaseActivity implements SaleSaleContract.View {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.iv_search)
+    ImageView ivSearch;
+    @BindView(R.id.tb_title)
+    Toolbar tbTitle;
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    private SaleSalePresenter saleSalePresenter;
+    private Map<String, Object> param;
+    private List<SaleOrderBean> orderList;
+    private SaleOutAdapter saleAdapter;
+    private ProOutAdapter proAdapter;
+    private int page = 1;
+    private String identity;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        saleSalePresenter = new SaleSalePresenter();
+        saleSalePresenter.onAttach(this);
+        setSupportActionBar(tbTitle);
+    }
+
+    @Override
+    protected void initData() {
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        identity = getIntent().getStringExtra("identity");
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        orderList = new ArrayList<>();
+        if (TextUtils.equals(identity, "1")) {
+            saleAdapter = new SaleOutAdapter(R.layout.item_sale_out, orderList);
+            saleAdapter.bindToRecyclerView(rvData);
+        } else {
+            proAdapter = new ProOutAdapter(R.layout.item_sale_out, orderList);
+            proAdapter.bindToRecyclerView(rvData);
+        }
+
+        param = WorkUtils.pageKey();
+        param.put("current", page);
+        param.put("identity", identity);
+    }
+
+    @Override
+    protected void initEvent() {
+        saleAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("current", page);
+                saleSalePresenter.getInsideOrder(param);
+            }
+        }, rvData);
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_order_serarch;
+    }
+
+
+    @OnClick(R.id.iv_search)
+    public void onViewClicked() {
+        String key = etKey.getText().toString();
+        if (TextUtils.isEmpty(key)) {
+            toast("请输入搜索关键字");
+            return;
+        }
+        param.put("searchValue", key);
+        saleSalePresenter.getInsideOrder(param);
+    }
+
+    @Override
+    public void saleList(List<SaleOrderBean> dataList) {
+
+    }
+
+    @Override
+    public void outList(List<SaleOrderBean> dataList) {
+        if (page == 1) {
+            orderList.clear();
+            orderList.addAll(dataList);
+            if (TextUtils.equals(identity, "1")) {
+                saleAdapter.notifyDataSetChanged();
+                saleAdapter.loadMoreComplete();
+            } else {
+                proAdapter.notifyDataSetChanged();
+                proAdapter.loadMoreComplete();
+            }
+        } else {
+            if (TextUtils.equals(identity, "1")) {
+                saleAdapter.loadMoreComplete();
+                orderList.addAll(dataList);
+                saleAdapter.notifyDataSetChanged();
+            } else {
+                proAdapter.loadMoreComplete();
+                orderList.addAll(dataList);
+                proAdapter.notifyDataSetChanged();
+            }
+        }
+        if (dataList.size() == 0) {
+            if (TextUtils.equals(identity, "1")) {
+                saleAdapter.loadMoreEnd();
+            } else {
+                proAdapter.loadMoreEnd();
+            }
+        } else {
+            page++;
+        }
+    }
+
+    @Override
+    public void insideList(List<SaleOrderBean> dataList) {
+
+    }
+
+    @Override
+    public void supplierList(List<SaleOrderBean> dataList) {
+
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/SaleOrderSearchActivity.java

+package com.wd.workoffice.ui.activity.bat;
+
+import android.text.TextUtils;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkBaseActivity;
+import com.wd.workoffice.bean.SaleOrderBean;
+import com.wd.workoffice.contract.SaleSaleContract;
+import com.wd.workoffice.presenter.SaleSalePresenter;
+import com.wd.workoffice.ui.adapter.ProOutAdapter;
+import com.wd.workoffice.ui.adapter.ProSaleAdapter;
+import com.wd.workoffice.ui.adapter.SaleOutAdapter;
+import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
+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 SaleOrderSearchActivity extends WorkBaseActivity implements SaleSaleContract.View {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.iv_search)
+    ImageView ivSearch;
+    @BindView(R.id.tb_title)
+    Toolbar tbTitle;
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    private SaleSalePresenter saleSalePresenter;
+    private Map<String, Object> param;
+    private List<SaleOrderBean> orderList;
+    private SaleSaleAdapter saleAdapter;
+    private ProSaleAdapter proAdapter;
+    private int page = 1;
+    private String identity;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        saleSalePresenter = new SaleSalePresenter();
+        saleSalePresenter.onAttach(this);
+        setSupportActionBar(tbTitle);
+    }
+
+    @Override
+    protected void initData() {
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        identity = getIntent().getStringExtra("identity");
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        orderList = new ArrayList<>();
+        if (TextUtils.equals(identity, "1")) {
+            saleAdapter = new SaleSaleAdapter(R.layout.item_sale, orderList);
+            saleAdapter.bindToRecyclerView(rvData);
+        } else {
+            proAdapter = new ProSaleAdapter(R.layout.item_sale, orderList);
+            proAdapter.bindToRecyclerView(rvData);
+        }
+
+        param = WorkUtils.pageKey();
+        param.put("current", page);
+        param.put("identity", identity);
+    }
+
+    @Override
+    protected void initEvent() {
+        saleAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("current", page);
+                saleSalePresenter.getInsideOrder(param);
+            }
+        }, rvData);
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_order_serarch;
+    }
+
+
+    @OnClick(R.id.iv_search)
+    public void onViewClicked() {
+        String key = etKey.getText().toString();
+        if (TextUtils.isEmpty(key)) {
+            toast("请输入搜索关键字");
+            return;
+        }
+        param.put("searchValue", key);
+        saleSalePresenter.getInsideOrder(param);
+    }
+
+    @Override
+    public void saleList(List<SaleOrderBean> dataList) {
+
+    }
+
+    @Override
+    public void outList(List<SaleOrderBean> dataList) {
+        if (page == 1) {
+            orderList.clear();
+            orderList.addAll(dataList);
+            if (TextUtils.equals(identity, "1")) {
+                saleAdapter.notifyDataSetChanged();
+                saleAdapter.loadMoreComplete();
+            } else {
+                proAdapter.notifyDataSetChanged();
+                proAdapter.loadMoreComplete();
+            }
+        } else {
+            if (TextUtils.equals(identity, "1")) {
+                saleAdapter.loadMoreComplete();
+                orderList.addAll(dataList);
+                saleAdapter.notifyDataSetChanged();
+            } else {
+                proAdapter.loadMoreComplete();
+                orderList.addAll(dataList);
+                proAdapter.notifyDataSetChanged();
+            }
+        }
+        if (dataList.size() == 0) {
+            if (TextUtils.equals(identity, "1")) {
+                saleAdapter.loadMoreEnd();
+            } else {
+                proAdapter.loadMoreEnd();
+            }
+        } else {
+            page++;
+        }
+    }
+
+    @Override
+    public void insideList(List<SaleOrderBean> dataList) {
+
+    }
+
+    @Override
+    public void supplierList(List<SaleOrderBean> dataList) {
+
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/StoreCrucibleActivity.java

-package com.wd.workoffice.ui.activity.bat;
-
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
-import com.wd.workoffice.R;
-import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.DepBean;
-import com.wd.workoffice.bean.ProcessBean;
-import com.wd.workoffice.bean.StockBean;
-import com.wd.workoffice.bean.workEnum.PermissionType;
-import com.wd.workoffice.contract.BatSaleContract;
-import com.wd.workoffice.presenter.BatSalePresenter;
-import com.wd.workoffice.util.DialogUtils;
-import com.wd.workoffice.util.UserKeeper;
-import com.wd.workoffice.util.WorkUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import androidx.annotation.Nullable;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-/**
- * 商店-坩埚
- * author : flexible
- * email : lgd19940421@163.com
- * github: https://github.com/FlexibleXd
- **/
-public class StoreCrucibleActivity extends WorkToolBarActivity implements BatSaleContract.View {
-    @BindView(R.id.tv_dep)
-    TextView tvDep;
-    @BindView(R.id.rl_dep)
-    RelativeLayout rlDep;
-    @BindView(R.id.tv_warehouse)
-    TextView tvWarehouse;
-    @BindView(R.id.rl_warehouse)
-    RelativeLayout rlWarehouse;
-    @BindView(R.id.tv_product)
-    TextView tvProduct;
-    @BindView(R.id.rl_product)
-    RelativeLayout rlProduct;
-    private BatSalePresenter batSalePresenter;
-    private QMUIDialog.MenuDialogBuilder depDialog;
-    private QMUIDialog.MenuDialogBuilder stockDialog;
-    private List<DepBean> depList;
-    List<String> depNameList = new ArrayList<>();
-    private DepBean chooseDep;
-    private Map<String, Object> stockParam;
-    private List<StockBean> stockList;
-    private List<String> stockNameList=new ArrayList<>();
-    private StockBean chooseStock;
-
-    @Override
-    protected void initView() {
-        ButterKnife.bind(this);
-        batSalePresenter = new BatSalePresenter();
-        batSalePresenter.onAttach(this);
-        depDialog = DialogUtils.listDialog(this);
-        stockDialog = DialogUtils.listDialog(this);
-    }
-
-    @Override
-    protected void initData() {
-        batSalePresenter.getDep(PermissionType.CRUCIBLE_SELL.getCode());
-        stockParam = WorkUtils.simpleParam();
-        stockParam.put("deptId", UserKeeper.getInstance().getUserDepId());
-        batSalePresenter.getStock(stockParam);
-//        stockParam.put("sign","send");
-//        stockParam.put("customerId", UserKeeper.getInstance().getUserId());
-    }
-
-    @Override
-    protected void initEvent() {
-    }
-
-    @Override
-    protected int layoutId() {
-        return R.layout.activity_bat_crucible;
-    }
-
-
-    @OnClick({ R.id.rl_product, R.id.rl_warehouse, R.id.rl_dep})
-    public void onViewClicked(View view) {
-        switch (view.getId()) {
-            case R.id.rl_dep:
-                depDialog.show();
-                break;
-            case R.id.rl_warehouse:
-                stockDialog.show();
-                break;
-            case R.id.rl_product:
-                if (chooseDep == null) {
-                    toast("请先选择接单部门");
-                    return;
-                }
-                if (chooseStock == null) {
-                    toast("请选择入库仓库");
-                    return;
-                }
-                startActivity(StoreSaleProductActivity.class, "depId", chooseDep.getId() + "",
-                        "depName", chooseDep.getName(),  "code", PermissionType.PROCESS_CRUCIBLE.getCode());
-                break;
-        }
-    }
-
-    @Override
-    public void processList(List<ProcessBean> dataList) {
-    }
-
-
-    @Override
-    public void depList(List<DepBean> dataList) {
-        depList = dataList;
-        for (DepBean dep : dataList) {
-            depNameList.add(dep.getName());
-        }
-        depDialog.addItems(depNameList.toArray(new String[depNameList.size()]), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                chooseDep = depList.get(which);
-                tvDep.setText(depNameList.get(which));
-                dialog.dismiss();
-            }
-        });
-    }
-
-    @Override
-    public void getStock(List<StockBean> dataList) {
-        stockList = dataList;
-        for (StockBean dep : dataList) {
-            stockNameList.add(dep.getName());
-        }
-        stockDialog.addItems(stockNameList.toArray(new String[stockNameList.size()]), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                chooseStock = stockList.get(which);
-                tvWarehouse.setText(stockNameList.get(which));
-                dialog.dismiss();
-            }
-        });
-    }
-
-}

app/src/main/java/com/wd/workoffice/ui/activity/bat/SupplierOrderSearchActivity.java

+package com.wd.workoffice.ui.activity.bat;
+
+import android.text.TextUtils;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkBaseActivity;
+import com.wd.workoffice.bean.SaleOrderBean;
+import com.wd.workoffice.contract.SaleSaleContract;
+import com.wd.workoffice.presenter.SaleSalePresenter;
+import com.wd.workoffice.ui.adapter.ProSaleAdapter;
+import com.wd.workoffice.ui.adapter.ProSupplierAdapter;
+import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
+import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
+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 SupplierOrderSearchActivity extends WorkBaseActivity implements SaleSaleContract.View {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.iv_search)
+    ImageView ivSearch;
+    @BindView(R.id.tb_title)
+    Toolbar tbTitle;
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    private SaleSalePresenter saleSalePresenter;
+    private Map<String, Object> param;
+    private List<SaleOrderBean> orderList;
+    private SaleSupplierAdapter saleAdapter;
+    private ProSupplierAdapter proAdapter;
+    private int page = 1;
+    private String identity;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        saleSalePresenter = new SaleSalePresenter();
+        saleSalePresenter.onAttach(this);
+        setSupportActionBar(tbTitle);
+    }
+
+    @Override
+    protected void initData() {
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        identity = getIntent().getStringExtra("identity");
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        orderList = new ArrayList<>();
+        if (TextUtils.equals(identity, "1")) {
+            saleAdapter = new SaleSupplierAdapter(R.layout.item_sale_supplier, orderList);
+            saleAdapter.bindToRecyclerView(rvData);
+        } else {
+            proAdapter = new ProSupplierAdapter(R.layout.item_sale_supplier, orderList);
+            proAdapter.bindToRecyclerView(rvData);
+        }
+
+        param = WorkUtils.pageKey();
+        param.put("current", page);
+        param.put("identity", identity);
+    }
+
+    @Override
+    protected void initEvent() {
+        saleAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("current", page);
+                saleSalePresenter.getInsideOrder(param);
+            }
+        }, rvData);
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_order_serarch;
+    }
+
+
+    @OnClick(R.id.iv_search)
+    public void onViewClicked() {
+        String key = etKey.getText().toString();
+        if (TextUtils.isEmpty(key)) {
+            toast("请输入搜索关键字");
+            return;
+        }
+        param.put("searchValue", key);
+        saleSalePresenter.getInsideOrder(param);
+    }
+
+    @Override
+    public void saleList(List<SaleOrderBean> dataList) {
+
+    }
+
+    @Override
+    public void outList(List<SaleOrderBean> dataList) {
+        if (page == 1) {
+            orderList.clear();
+            orderList.addAll(dataList);
+            if (TextUtils.equals(identity, "1")) {
+                saleAdapter.notifyDataSetChanged();
+                saleAdapter.loadMoreComplete();
+            } else {
+                proAdapter.notifyDataSetChanged();
+                proAdapter.loadMoreComplete();
+            }
+        } else {
+            if (TextUtils.equals(identity, "1")) {
+                saleAdapter.loadMoreComplete();
+                orderList.addAll(dataList);
+                saleAdapter.notifyDataSetChanged();
+            } else {
+                proAdapter.loadMoreComplete();
+                orderList.addAll(dataList);
+                proAdapter.notifyDataSetChanged();
+            }
+        }
+        if (dataList.size() == 0) {
+            if (TextUtils.equals(identity, "1")) {
+                saleAdapter.loadMoreEnd();
+            } else {
+                proAdapter.loadMoreEnd();
+            }
+        } else {
+            page++;
+        }
+    }
+
+    @Override
+    public void insideList(List<SaleOrderBean> dataList) {
+
+    }
+
+    @Override
+    public void supplierList(List<SaleOrderBean> dataList) {
+
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductInsideOrderActivity.java

 package com.wd.workoffice.ui.activity.bat.product;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.ui.activity.bat.InsideOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.SaleInsideFragment;
 
@@ -71,4 +74,20 @@ public class ProductInsideOrderActivity extends WorkToolBarActivity {
         return R.layout.activity_sale_sale;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_search, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.search:
+                startActivity(InsideOrderSearchActivity.class, "identity", "2","","");
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductOutOrderActivity.java

 package com.wd.workoffice.ui.activity.bat.product;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.ui.activity.bat.InsideOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.OutOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.ProOutFragment;
 import com.wd.workoffice.ui.fg.SaleOutFragment;
@@ -74,4 +78,20 @@ public class ProductOutOrderActivity extends WorkToolBarActivity {
         return R.layout.activity_sale_sale;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_search, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.search:
+                startActivity(OutOrderSearchActivity.class, "identity", "2","","");
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductSaleOrderActivity.java

 package com.wd.workoffice.ui.activity.bat.product;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.ProSaleFragment;
-import com.wd.workoffice.ui.fg.SaleSaleFragment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -71,4 +72,20 @@ public class ProductSaleOrderActivity extends WorkToolBarActivity {
         return R.layout.activity_sale_sale;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_search, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.search:
+                startActivity(SaleOrderSearchActivity.class, "identity", "2","","");
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductSupplierOrderActivity.java

 package com.wd.workoffice.ui.activity.bat.product;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.ProSupplierFragment;
-import com.wd.workoffice.ui.fg.SaleSupplierFragment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -71,4 +72,20 @@ public class ProductSupplierOrderActivity extends WorkToolBarActivity {
         return R.layout.activity_sale_sale;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_search, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.search:
+                startActivity(SupplierOrderSearchActivity.class, "identity", "2","","");
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleInsideOrderActivity.java

 package com.wd.workoffice.ui.activity.bat.sale;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.ui.activity.bat.InsideOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.SaleInsideFragment;
 import com.wd.workoffice.ui.fg.SaleSaleFragment;
@@ -70,4 +73,19 @@ public class SaleInsideOrderActivity extends WorkToolBarActivity {
         return R.layout.activity_sale_sale;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_search, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.search:
+                startActivity(InsideOrderSearchActivity.class, "identity", "1","","");
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleOutOrderActivity.java

 package com.wd.workoffice.ui.activity.bat.sale;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.ui.activity.bat.InsideOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.OutOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.SaleOutFragment;
 import com.wd.workoffice.ui.fg.SaleSaleFragment;
@@ -71,5 +75,20 @@ public class SaleOutOrderActivity extends WorkToolBarActivity {
     protected int layoutId() {
         return R.layout.activity_sale_sale;
     }
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_search, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.search:
+                startActivity(OutOrderSearchActivity.class, "identity", "1","","");
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleSaleOrderActivity.java

 package com.wd.workoffice.ui.activity.bat.sale;
 
-import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
-import com.wd.workoffice.ui.fg.MainFragment;
 import com.wd.workoffice.ui.fg.SaleSaleFragment;
 
 import java.util.ArrayList;
@@ -73,4 +72,20 @@ public class SaleSaleOrderActivity extends WorkToolBarActivity {
         return R.layout.activity_sale_sale;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_search, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.search:
+                startActivity(SaleOrderSearchActivity.class, "identity", "1","","");
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleSupplierOrderActivity.java

 package com.wd.workoffice.ui.activity.bat.sale;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
-import com.wd.workoffice.ui.fg.SaleSaleFragment;
 import com.wd.workoffice.ui.fg.SaleSupplierFragment;
 
 import java.util.ArrayList;
@@ -69,4 +70,19 @@ public class SaleSupplierOrderActivity extends WorkToolBarActivity {
         return R.layout.activity_sale_sale;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_search, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.search:
+                startActivity(SupplierOrderSearchActivity.class, "identity", "1","","");
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }

app/src/main/java/com/wd/workoffice/ui/fg/MainFragment.java

@@ -3,22 +3,19 @@ package com.wd.workoffice.ui.fg;
 import android.view.View;
 import android.widget.TextView;
 
-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.BaseBean;
 import com.wd.workoffice.app.WorkBaseFg;
-import com.wd.workoffice.bean.StockBean;
-import com.wd.workoffice.bean.UserInfoBean;
 import com.wd.workoffice.bean.vo.BatLayoutVo;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.bat.StoreCrucibleActivity;
-import com.wd.workoffice.ui.activity.bat.StoreOutsourcingActivity;
-import com.wd.workoffice.ui.activity.bat.StoreSaleActivity;
-import com.wd.workoffice.ui.activity.bat.StoreSupplierActivity;
-import com.wd.workoffice.ui.activity.bat.StoreTradingActivity;
+import com.wd.workoffice.ui.activity.bat.store.StoreCrucibleActivity;
+import com.wd.workoffice.ui.activity.bat.store.StoreOutsourcingActivity;
+import com.wd.workoffice.ui.activity.bat.store.StoreSaleActivity;
+import com.wd.workoffice.ui.activity.bat.store.StoreSupplierActivity;
+import com.wd.workoffice.ui.activity.bat.store.StoreTradingActivity;
 import com.wd.workoffice.ui.activity.bat.product.ProductInsideOrderActivity;
 import com.wd.workoffice.ui.activity.bat.product.ProductOutOrderActivity;
 import com.wd.workoffice.ui.activity.bat.product.ProductSaleOrderActivity;

app/src/main/java/com/wd/workoffice/ui/fg/SaleInsideFragment.java

@@ -22,7 +22,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-
 /**
  * author : flexible
  * email : lgd19940421@163.com

app/src/main/res/layout/activity_order_serarch.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    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">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingVertical="4mm">
+
+
+            <EditText
+                android:id="@+id/et_key"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/shape_client_search" />
+
+            <ImageView
+                android:id="@+id/iv_search"
+                android:layout_width="30mm"
+                android:layout_height="30mm"
+                android:layout_marginHorizontal="5mm"
+                android:src="@mipmap/search"
+                android:text="搜索" />
+        </LinearLayout>
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <View style="@style/dividerX" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_data"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
\ No newline at end of file

app/src/main/res/menu/menu_modify.xml → app/src/main/res/menu/menu_search.xml

@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/ok"
-        android:title="完成"
+        android:id="@+id/search"
+        android:title="搜索"
         app:showAsAction="always" />
 </menu>
\ No newline at end of file