1.mes订单追踪

app/src/main/AndroidManifest.xml

@@ -1606,6 +1606,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.order.MesOrderProcessActivity"
+            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.mes.order.MesOrderDetailActivity"
             android:configChanges="keyboardHidden|orientation"

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

+package com.wd.workoffice.bean.mesBean;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesOrderDetailBean {
+
+
+    /**
+     * manufactureOrderNumber : BCP-LT191128001
+     * customerName : 张家港浦项不锈钢有限公司
+     * drawingNumber : null
+     * processCode : null
+     * orderNumber : SOGK1911280001
+     * weight : 0.0
+     * actualUnitWeight : 0.0
+     * planCount : 60
+     * deliveryDate : null
+     * opComDate : null
+     * cxNum : 0
+     * ghNum : 0
+     * jgNum : 0
+     * ptNum : 0
+     * scNum : 0
+     * tsNum : 0
+     * fjNum : 0
+     * wasteCount : null
+     * actualQuantity : null
+     * endTime : null
+     * differenceNum : null
+     * periodDays : null
+     * noOperateNum : null
+     * noWarehouseNum : null
+     * onLineNum : null
+     */
+
+    private String manufactureOrderNumber;
+    private String customerName;
+    private String drawingNumber;
+    private String processCode;
+    private String orderNumber;
+    private String weight;
+    private String actualUnitWeight;
+    private String planCount;
+    private String deliveryDate;
+    private String opComDate;
+    private String cxNum;
+    private String ghNum;
+    private String jgNum;
+    private String ptNum;
+    private String scNum;
+    private String tsNum;
+    private String fjNum;
+    private String wasteCount;
+    private String actualQuantity;
+    private String endTime;
+    private String differenceNum;
+    private String periodDays;
+    private String noOperateNum;
+    private String noWarehouseNum;
+    private String onLineNum;
+
+    public String getManufactureOrderNumber() {
+        return manufactureOrderNumber;
+    }
+
+    public void setManufactureOrderNumber(String manufactureOrderNumber) {
+        this.manufactureOrderNumber = manufactureOrderNumber;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getDrawingNumber() {
+        return drawingNumber;
+    }
+
+    public void setDrawingNumber(String drawingNumber) {
+        this.drawingNumber = drawingNumber;
+    }
+
+    public String getProcessCode() {
+        return processCode;
+    }
+
+    public void setProcessCode(String processCode) {
+        this.processCode = processCode;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+
+    public String getActualUnitWeight() {
+        return actualUnitWeight;
+    }
+
+    public void setActualUnitWeight(String actualUnitWeight) {
+        this.actualUnitWeight = actualUnitWeight;
+    }
+
+    public String getPlanCount() {
+        return planCount;
+    }
+
+    public void setPlanCount(String planCount) {
+        this.planCount = planCount;
+    }
+
+    public String getDeliveryDate() {
+        return deliveryDate;
+    }
+
+    public void setDeliveryDate(String deliveryDate) {
+        this.deliveryDate = deliveryDate;
+    }
+
+    public String getOpComDate() {
+        return opComDate;
+    }
+
+    public void setOpComDate(String opComDate) {
+        this.opComDate = opComDate;
+    }
+
+    public String getCxNum() {
+        return cxNum;
+    }
+
+    public void setCxNum(String cxNum) {
+        this.cxNum = cxNum;
+    }
+
+    public String getGhNum() {
+        return ghNum;
+    }
+
+    public void setGhNum(String ghNum) {
+        this.ghNum = ghNum;
+    }
+
+    public String getJgNum() {
+        return jgNum;
+    }
+
+    public void setJgNum(String jgNum) {
+        this.jgNum = jgNum;
+    }
+
+    public String getPtNum() {
+        return ptNum;
+    }
+
+    public void setPtNum(String ptNum) {
+        this.ptNum = ptNum;
+    }
+
+    public String getScNum() {
+        return scNum;
+    }
+
+    public void setScNum(String scNum) {
+        this.scNum = scNum;
+    }
+
+    public String getTsNum() {
+        return tsNum;
+    }
+
+    public void setTsNum(String tsNum) {
+        this.tsNum = tsNum;
+    }
+
+    public String getFjNum() {
+        return fjNum;
+    }
+
+    public void setFjNum(String fjNum) {
+        this.fjNum = fjNum;
+    }
+
+    public String getWasteCount() {
+        return wasteCount;
+    }
+
+    public void setWasteCount(String wasteCount) {
+        this.wasteCount = wasteCount;
+    }
+
+    public String getActualQuantity() {
+        return actualQuantity;
+    }
+
+    public void setActualQuantity(String actualQuantity) {
+        this.actualQuantity = actualQuantity;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getDifferenceNum() {
+        return differenceNum;
+    }
+
+    public void setDifferenceNum(String differenceNum) {
+        this.differenceNum = differenceNum;
+    }
+
+    public String getPeriodDays() {
+        return periodDays;
+    }
+
+    public void setPeriodDays(String periodDays) {
+        this.periodDays = periodDays;
+    }
+
+    public String getNoOperateNum() {
+        return noOperateNum;
+    }
+
+    public void setNoOperateNum(String noOperateNum) {
+        this.noOperateNum = noOperateNum;
+    }
+
+    public String getNoWarehouseNum() {
+        return noWarehouseNum;
+    }
+
+    public void setNoWarehouseNum(String noWarehouseNum) {
+        this.noWarehouseNum = noWarehouseNum;
+    }
+
+    public String getOnLineNum() {
+        return onLineNum;
+    }
+
+    public void setOnLineNum(String onLineNum) {
+        this.onLineNum = onLineNum;
+    }
+}

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -536,12 +536,25 @@ public interface MesApiService {
     @POST("/himes/api/customer/show/page.json")
     Observable<BaseMesBean> clientPhoneList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+//    /**
+//     * @return
+//     */
+//    @POST("/himes/api/order/show/list.json")
+//    Observable<BaseMesBean> orderList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
      * @return
      */
-    @POST("/himes/api/order/show/list.json")
+    @POST("/himes/api/productionStatistics/show/padList.json")
     Observable<BaseMesBean> orderList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+
+    /**
+     * @return
+     */
+    @GET("/himes/api/productionStatistics/show/{id}.json")
+    Observable<BaseMesBean> orderDetail(@Path("id") String id);
+
     /**
      * @return
      */

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

 package com.wd.workoffice.ui.activity.mes.order;
 
-import android.graphics.Color;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.mesBean.MesOrderBean;
+import com.wd.workoffice.bean.mesBean.MesOrderDetailBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import flexible.xd.android_base.utils.TimeUtils;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
 
 /**
  * 订单追踪 详情
@@ -22,59 +24,124 @@ import flexible.xd.android_base.utils.TimeUtils;
  **/
 public class MesOrderDetailActivity extends WorkToolBarActivity {
 
-
-    @BindView(R.id.tv_top_no)
-    TextView tvTopNo;
-    @BindView(R.id.tv_status)
-    TextView tvStatus;
-    @BindView(R.id.tv_no)
-    TextView tvNo;
-    @BindView(R.id.tv_pro_name)
-    TextView tvProName;
-    @BindView(R.id.tv_pro_code)
-    TextView tvProCode;
-    @BindView(R.id.tv_factory_name)
-    TextView tvFactoryName;
-    @BindView(R.id.tv_factory_code)
-    TextView tvFactoryCode;
-    @BindView(R.id.tv_order_time)
-    TextView tvOrderTime;
-    @BindView(R.id.tv_num)
-    TextView tvNum;
-    @BindView(R.id.tv_weight)
-    TextView tvWeight;
-    @BindView(R.id.tv_time)
-    TextView tvTime;
+    @BindView(R.id.tv_content1)
+    TextView tvContent1;
+    @BindView(R.id.tv_content2)
+    TextView tvContent2;
+    @BindView(R.id.tv_content3)
+    TextView tvContent3;
+    @BindView(R.id.tv_content4)
+    TextView tvContent4;
+    @BindView(R.id.tv_content5)
+    TextView tvContent5;
+    @BindView(R.id.tv_content6)
+    TextView tvContent6;
+    @BindView(R.id.tv_content7)
+    TextView tvContent7;
+    @BindView(R.id.tv_content8)
+    TextView tvContent8;
+    @BindView(R.id.tv_content9)
+    TextView tvContent9;
+    @BindView(R.id.tv_content10)
+    TextView tvContent10;
+    @BindView(R.id.tv_content11)
+    TextView tvContent11;
+    @BindView(R.id.tv_content12)
+    TextView tvContent12;
+    @BindView(R.id.tv_content14)
+    TextView tvContent14;
+    @BindView(R.id.tv_content15)
+    TextView tvContent15;
+    @BindView(R.id.tv_content16)
+    TextView tvContent16;
+    @BindView(R.id.tv_content17)
+    TextView tvContent17;
+    @BindView(R.id.tv_content18)
+    TextView tvContent18;
+    @BindView(R.id.tv_content19)
+    TextView tvContent19;
+    @BindView(R.id.tv_content20)
+    TextView tvContent20;
+    @BindView(R.id.tv_content21)
+    TextView tvContent21;
+    @BindView(R.id.tv_content22)
+    TextView tvContent22;
+    @BindView(R.id.tv_content23)
+    TextView tvContent23;
+    @BindView(R.id.tv_content13)
+    TextView tvContent13;
+    @BindView(R.id.tv_content24)
+    TextView tvContent24;
+    @BindView(R.id.tv_content25)
+    TextView tvContent25;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        MesOrderBean.ListBean info = JSON.parseObject(getIntent().getStringExtra("info"), MesOrderBean.ListBean.class);
-        if (TextUtils.equals(info.getScheduleStatus(), "") || TextUtils.equals(info.getScheduleStatus(), "0")) {
-            tvStatus.setText("未排程");
-        } else {
-            tvStatus.setText("已排程");
-        }
-        tvTopNo.setText(String.format("制造令单号:%s", info.getManufactureOrderNumber()));
-        tvNo.setText(info.getManufactureOrderNumber());
-        tvFactoryName.setText(info.getSiteName());
-        tvFactoryCode.setText(info.getSiteCode());
-        tvNum.setText(info.getPlanCount() + "");
-        tvProCode.setText(info.getProductCode());
-        tvProName.setText(info.getProductName());
-        tvWeight.setText(info.getUnit());
-        tvTime.setText(TimeUtils.millis2String(info.getDeliveryDate()));
-        tvOrderTime.setText(TimeUtils.millis2String(info.getCreateDateTime()));
     }
 
     @Override
     protected void initData() {
+        getData();
     }
 
     @Override
     protected void initEvent() {
     }
 
+    private void getData() {
+        RtfUtils.getMesRtf().orderDetail(getIntent().getStringExtra("id")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                MesOrderDetailBean mesOrderDetailBean = JSON.parseObject(data.getData().toString(), MesOrderDetailBean.class);
+                tvContent1.setText(mesOrderDetailBean.getCustomerName());
+                tvContent2.setText(mesOrderDetailBean.getManufactureOrderNumber());
+                tvContent3.setText(mesOrderDetailBean.getDrawingNumber());
+                tvContent4.setText(mesOrderDetailBean.getProcessCode());
+                tvContent5.setText(mesOrderDetailBean.getOrderNumber());
+                tvContent6.setText(mesOrderDetailBean.getWeight());
+                tvContent7.setText(mesOrderDetailBean.getActualUnitWeight());
+                tvContent8.setText(mesOrderDetailBean.getPlanCount());
+                tvContent9.setText(mesOrderDetailBean.getDeliveryDate());
+                tvContent10.setText(mesOrderDetailBean.getOpComDate());
+
+
+                tvContent11.setText(mesOrderDetailBean.getCxNum());
+
+                tvContent12.setText(mesOrderDetailBean.getGhNum());
+                tvContent13.setText(mesOrderDetailBean.getJgNum());
+                tvContent14.setText(mesOrderDetailBean.getPtNum());
+                tvContent15.setText(mesOrderDetailBean.getScNum());
+                tvContent16.setText(mesOrderDetailBean.getTsNum());
+                tvContent17.setText(mesOrderDetailBean.getFjNum());
+                tvContent18.setText(mesOrderDetailBean.getWasteCount());
+                tvContent19.setText(mesOrderDetailBean.getActualQuantity());
+                tvContent20.setText(mesOrderDetailBean.getEndTime());
+                tvContent21.setText(mesOrderDetailBean.getDifferenceNum());
+                tvContent22.setText(mesOrderDetailBean.getPeriodDays());
+                tvContent23.setText(mesOrderDetailBean.getNoOperateNum());
+                tvContent24.setText(mesOrderDetailBean.getNoWarehouseNum());
+                tvContent25.setText(mesOrderDetailBean.getOnLineNum());
+
+            }
+        });
+    }
+
     @Override
     protected int layoutId() {
         return R.layout.activity_mes_order_detail;

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;
+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;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.MesOrderAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.ArrayList;
+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;
+import butterknife.ButterKnife;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesOrderProcessActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    private int page = 1;
+    private Map<String, Object> param;
+    private MesOrderAdapter dataAdapter;
+    private List<MesOrderBean> dataList;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        param = WorkUtils.pageMesKey();
+        page = 1;
+        param.put("pageNum", page);
+        Map<String ,Object> paramMap =new HashMap<>();
+        param.put("paramMap", paramMap);
+        dataList = new ArrayList<>();
+        dataAdapter = new MesOrderAdapter(R.layout.item_mes_order, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        dataAdapter.notifyDataSetChanged();
+        getData();
+    }
+
+
+
+    private void getData() {
+        RtfUtils.getMesRtf().orderList("1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<MesOrderBean> getList = JSON.parseArray(data.getData().toString(), MesOrderBean.class);
+                dataList.clear();
+                dataList.addAll(getList);
+                dataAdapter.notifyDataSetChanged();
+//                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++;
+//                }
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            page = 1;
+            param.put("pageNum", page);
+            getData();
+        });
+//        dataAdapter.setOnLoadMoreListener(() -> {
+//            param.put("pageNum", page);
+//            getData();
+//        }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(MesOrderDetailActivity.class,"id",dataList.get(position).getManufactureOrderNumber());
+            }
+        });
+    }
+
+
+
+
+
+    @Override
+    protected int layoutId() {
+        return R.layout.fg_work_contacts;
+    }
+
+}

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

@@ -19,29 +19,29 @@ import flexible.xd.android_base.utils.TimeUtils;
  * Created by flexible on 2018/8/13.
  */
 
-public class MesOrderAdapter extends BaseQuickAdapter<MesOrderBean.ListBean, BaseViewHolder> {
+public class MesOrderAdapter extends BaseQuickAdapter<MesOrderBean, BaseViewHolder> {
     public MesOrderAdapter(int layoutResId, List data) {
         super(layoutResId, data);
     }
 
 
     @Override
-    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,"未排程");
-        } else if (TextUtils.equals(item.getScheduleStatus(),"-")){
-            helper.setTextColor(R.id.tv_status, Color.parseColor("#FF34AA68"));
-            helper.setText(R.id.tv_status,"");
-        }else {
-            helper.setTextColor(R.id.tv_status, Color.parseColor("#FF34AA68"));
-            helper.setText(R.id.tv_status,"已排程");
-        }
+    protected void convert(BaseViewHolder helper, MesOrderBean 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,"未排程");
+//        } else if (TextUtils.equals(item.getScheduleStatus(),"-")){
+//            helper.setTextColor(R.id.tv_status, Color.parseColor("#FF34AA68"));
+//            helper.setText(R.id.tv_status,"");
+//        }else {
+//            helper.setTextColor(R.id.tv_status, Color.parseColor("#FF34AA68"));
+//            helper.setText(R.id.tv_status,"已排程");
+//        }
         helper.setText(R.id.tv_no,String.format("指令单号:%s", item.getManufactureOrderNumber()));
-        helper.setText(R.id.tv_name, item.getProductName());
-        helper.setText(R.id.tv_factory_name, item.getSiteName());
-        helper.setText(R.id.tv_num, item.getPlanCount()+"");
-        helper.setText(R.id.tv_time, TimeUtils.millis2String(item.getDeliveryDate()));
+        helper.setText(R.id.tv_client, item.getCustomerName());
+        helper.setText(R.id.tv_img_code, item.getDrawingNumber());
+        helper.setText(R.id.tv_order_num, item.getPlanCount()+"");
+        helper.setText(R.id.tv_road,item.getProcessCode());
     }
 
 }

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

@@ -14,6 +14,7 @@ import com.wd.workoffice.ui.activity.mes.QualityTraceabilityActivity;
 import com.wd.workoffice.ui.activity.mes.analysis.MesAnalysisActivity;
 import com.wd.workoffice.ui.activity.mes.order.MesOrderActivity;
 import com.wd.workoffice.ui.activity.mes.MesProcessActivity;
+import com.wd.workoffice.ui.activity.mes.order.MesOrderProcessActivity;
 import com.wd.workoffice.ui.activity.mes.report.MesReportActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketActivity;
 import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
@@ -105,7 +106,7 @@ public class MesFragment extends WorkBaseFg {
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 switch (position) {
                     case 0:
-                        startActivity(MesOrderActivity.class);
+                        startActivity(MesOrderProcessActivity.class);
                         break;
                     case 1:
                         startActivity(MesReportActivity.class);

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

@@ -64,7 +64,7 @@ public class MesOrderFragment extends WorkBaseFg {
     private int page = 1;
     private Map<String, Object> param;
     private MesOrderAdapter dataAdapter;
-    private List<MesOrderBean.ListBean> dataList;
+    private List<MesOrderBean> dataList;
 
     @Override
     protected void initView() {
@@ -100,42 +100,42 @@ public class MesOrderFragment extends WorkBaseFg {
     }
 
     private void getData() {
-        RtfUtils.getMesRtf().orderList("1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
-            @Override
-            public void doOnSubscribe(Disposable d) {
-            }
-
-            @Override
-            public void onFail(String errorMsg) {
-                hideLoading();
-                toast(errorMsg);
-            }
-
-            @Override
-            public void onSuccess(BaseMesBean data) {
-                hideLoading();
-                if (!data.isSuccess()) {
-                    toast(data.getMessage());
-                    return;
-                }
-                List<MesOrderBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesOrderBean.class).getList();
-                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++;
-                }
-            }
-        });
+//        RtfUtils.getMesRtf().orderList("1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+//            @Override
+//            public void doOnSubscribe(Disposable d) {
+//            }
+//
+//            @Override
+//            public void onFail(String errorMsg) {
+//                hideLoading();
+//                toast(errorMsg);
+//            }
+//
+//            @Override
+//            public void onSuccess(BaseMesBean data) {
+//                hideLoading();
+//                if (!data.isSuccess()) {
+//                    toast(data.getMessage());
+//                    return;
+//                }
+//                List<MesOrderBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesOrderBean.class).getList();
+//                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++;
+//                }
+//            }
+//        });
     }
 
     @Override
@@ -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,"info",JSON.toJSONString(dataList.get(position)));
+                startActivity(MesOrderDetailActivity.class,"id",dataList.get(position).getManufactureOrderNumber());
             }
         });
     }

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

 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_centerHorizontal="true"
@@ -34,6 +35,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:text="已排程"
+                android:visibility="gone"
                 android:textColor="#ff34aa68"
                 android:textSize="14sp" />
         </RelativeLayout>
@@ -52,13 +54,13 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="产品名称"
+                android:text="客户名称"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="14sp" />
 
 
             <TextView
-                android:id="@+id/tv_name"
+                android:id="@+id/tv_client"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:gravity="right"
@@ -73,13 +75,13 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="工厂名称"
+                android:text="订单数量"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="14sp" />
 
 
             <TextView
-                android:id="@+id/tv_factory_name"
+                android:id="@+id/tv_order_num"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
@@ -96,13 +98,13 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="计划数量"
+                android:text="图号"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="14sp" />
 
 
             <TextView
-                android:id="@+id/tv_num"
+                android:id="@+id/tv_img_code"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:gravity="right"
@@ -119,13 +121,13 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="要求交货时间:"
+                android:text="工艺路线:"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="14sp" />
 
 
             <TextView
-                android:id="@+id/tv_time"
+                android:id="@+id/tv_road"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:gravity="right"