1.mes订单

2.TODO 点维修详情测试+单独菜单

app/src/main/java/com/wd/workoffice/bean/mesBean/MesOrderBean.java

@@ -9,8 +9,20 @@ import java.util.List;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class MesOrderBean     {
+public class MesOrderBean extends BaseMesPageBean {
 
+
+    private List<ListBean> list;
+
+    public List<ListBean> getList() {
+        return list;
+    }
+
+    public void setList(List<ListBean> list) {
+        this.list = list;
+    }
+
+    public static class ListBean {
         /**
          * manufactureOrderNumber : BCP-LT191128001
          * customerName : 张家港浦项不锈钢有限公司
@@ -64,4 +76,5 @@ public class MesOrderBean     {
         public void setProcessCode(String processCode) {
             this.processCode = processCode;
         }
+    }
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/order/MesOrderProcessActivity.java

 package com.wd.workoffice.ui.activity.mes.order;
 
-import android.os.Bundle;
 import android.view.View;
 
 import com.alibaba.fastjson.JSON;
@@ -8,7 +7,6 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
-import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.mesBean.MesOrderBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -21,7 +19,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
@@ -44,7 +41,7 @@ public class MesOrderProcessActivity extends WorkToolBarActivity {
     private int page = 1;
     private Map<String, Object> param;
     private MesOrderAdapter dataAdapter;
-    private List<MesOrderBean> dataList;
+    private List<MesOrderBean.ListBean> dataList;
 
     @Override
     protected void initView() {
@@ -89,25 +86,25 @@ public class MesOrderProcessActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
-                List<MesOrderBean> getList = JSON.parseArray(data.getData().toString(), MesOrderBean.class);
-                dataList.clear();
-                dataList.addAll(getList);
-                dataAdapter.notifyDataSetChanged();
-//                if (page == 1) {
+                List<MesOrderBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesOrderBean.class).getList();
 //                dataList.clear();
 //                dataList.addAll(getList);
 //                dataAdapter.notifyDataSetChanged();
-//                    dataAdapter.loadMoreComplete();
-//                } else {
-//                    dataAdapter.loadMoreComplete();
-//                    dataList.addAll(getList);
-//                    dataAdapter.notifyDataSetChanged();
-//                }
-//                if (getList.size() == 0) {
-//                    dataAdapter.loadMoreEnd();
-//                } else {
-//                    page++;
-//                }
+                if (page == 1) {
+                    dataList.clear();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                    dataAdapter.loadMoreComplete();
+                } else {
+                    dataAdapter.loadMoreComplete();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    dataAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
             }
         });
     }
@@ -119,10 +116,10 @@ public class MesOrderProcessActivity extends WorkToolBarActivity {
             param.put("pageNum", page);
             getData();
         });
-//        dataAdapter.setOnLoadMoreListener(() -> {
-//            param.put("pageNum", page);
-//            getData();
-//        }, rvData);
+        dataAdapter.setOnLoadMoreListener(() -> {
+            param.put("pageNum", page);
+            getData();
+        }, rvData);
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {

app/src/main/java/com/wd/workoffice/ui/adapter/MesOrderAdapter.java

@@ -19,14 +19,14 @@ import flexible.xd.android_base.utils.TimeUtils;
  * Created by flexible on 2018/8/13.
  */
 
-public class MesOrderAdapter extends BaseQuickAdapter<MesOrderBean, BaseViewHolder> {
+public class MesOrderAdapter extends BaseQuickAdapter<MesOrderBean.ListBean, BaseViewHolder> {
     public MesOrderAdapter(int layoutResId, List data) {
         super(layoutResId, data);
     }
 
 
     @Override
-    protected void convert(BaseViewHolder helper, MesOrderBean item) {
+    protected void convert(BaseViewHolder helper, MesOrderBean.ListBean item) {
 //        if (TextUtils.equals(item.getScheduleStatus(),"")||TextUtils.equals(item.getScheduleStatus(),"0") ) {
 //            helper.setTextColor(R.id.tv_status, Color.parseColor("#FFD16A6A"));
 //            helper.setText(R.id.tv_status,"未排程");

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

@@ -152,7 +152,7 @@ public class MesOrderFragment extends WorkBaseFg {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesOrderDetailActivity.class,"id",dataList.get(position).getManufactureOrderNumber());
+//                startActivity(MesOrderDetailActivity.class,"id",dataList.get(position).getManufactureOrderNumber());
             }
         });
     }