1.工单新增编辑

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改

app/src/main/AndroidManifest.xml

@@ -1281,6 +1281,22 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.ticket.MesTicketTakeOnActivity"
+            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.ticket.MesTicketProActivity"
+            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.user.MesUserDataAddActivity"
             android:configChanges="keyboardHidden|orientation"

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

+package com.wd.workoffice.bean.mesBean;
+
+import com.wd.workoffice.app.BaseMesPageBean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class TakeOnBean 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 {
+        /**
+         * id : ab883735794211ea8334fa163e1166bd
+         * createDateTime : 1586313784000
+         * updateDateTime : null
+         * userCode : BM003
+         * name : 测试部门3
+         * sex : null
+         * email : null
+         * mobile : null
+         * tel : null
+         * status : 1
+         * siteId : 1c37c889ffa211e98334fa163e1166bd
+         * siteCode : ZWLT
+         * siteDesc : 铝碳厂
+         * orgId : 5ac6962d9ed911e8b81100163e049447
+         * orgCode : 00001
+         * orgDesc : 正望集团
+         * employmentDate : null
+         * expiryDate : null
+         * birthday : null
+         * address : null
+         * remarks : null
+         * createBy : null
+         * loginName : null
+         * createByName : hello
+         * delete : null
+         */
+
+        private String id;
+        private long createDateTime;
+        private Object updateDateTime;
+        private String userCode;
+        private String name;
+        private Object sex;
+        private Object email;
+        private Object mobile;
+        private Object tel;
+        private int status;
+        private String siteId;
+        private String siteCode;
+        private String siteDesc;
+        private String orgId;
+        private String orgCode;
+        private String orgDesc;
+        private Object employmentDate;
+        private Object expiryDate;
+        private Object birthday;
+        private Object address;
+        private Object remarks;
+        private Object createBy;
+        private Object loginName;
+        private String createByName;
+        private Object delete;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public long getCreateDateTime() {
+            return createDateTime;
+        }
+
+        public void setCreateDateTime(long createDateTime) {
+            this.createDateTime = createDateTime;
+        }
+
+        public Object getUpdateDateTime() {
+            return updateDateTime;
+        }
+
+        public void setUpdateDateTime(Object updateDateTime) {
+            this.updateDateTime = updateDateTime;
+        }
+
+        public String getUserCode() {
+            return userCode;
+        }
+
+        public void setUserCode(String userCode) {
+            this.userCode = userCode;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Object getSex() {
+            return sex;
+        }
+
+        public void setSex(Object sex) {
+            this.sex = sex;
+        }
+
+        public Object getEmail() {
+            return email;
+        }
+
+        public void setEmail(Object email) {
+            this.email = email;
+        }
+
+        public Object getMobile() {
+            return mobile;
+        }
+
+        public void setMobile(Object mobile) {
+            this.mobile = mobile;
+        }
+
+        public Object getTel() {
+            return tel;
+        }
+
+        public void setTel(Object tel) {
+            this.tel = tel;
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public void setStatus(int status) {
+            this.status = status;
+        }
+
+        public String getSiteId() {
+            return siteId;
+        }
+
+        public void setSiteId(String siteId) {
+            this.siteId = siteId;
+        }
+
+        public String getSiteCode() {
+            return siteCode;
+        }
+
+        public void setSiteCode(String siteCode) {
+            this.siteCode = siteCode;
+        }
+
+        public String getSiteDesc() {
+            return siteDesc;
+        }
+
+        public void setSiteDesc(String siteDesc) {
+            this.siteDesc = siteDesc;
+        }
+
+        public String getOrgId() {
+            return orgId;
+        }
+
+        public void setOrgId(String orgId) {
+            this.orgId = orgId;
+        }
+
+        public String getOrgCode() {
+            return orgCode;
+        }
+
+        public void setOrgCode(String orgCode) {
+            this.orgCode = orgCode;
+        }
+
+        public String getOrgDesc() {
+            return orgDesc;
+        }
+
+        public void setOrgDesc(String orgDesc) {
+            this.orgDesc = orgDesc;
+        }
+
+        public Object getEmploymentDate() {
+            return employmentDate;
+        }
+
+        public void setEmploymentDate(Object employmentDate) {
+            this.employmentDate = employmentDate;
+        }
+
+        public Object getExpiryDate() {
+            return expiryDate;
+        }
+
+        public void setExpiryDate(Object expiryDate) {
+            this.expiryDate = expiryDate;
+        }
+
+        public Object getBirthday() {
+            return birthday;
+        }
+
+        public void setBirthday(Object birthday) {
+            this.birthday = birthday;
+        }
+
+        public Object getAddress() {
+            return address;
+        }
+
+        public void setAddress(Object address) {
+            this.address = address;
+        }
+
+        public Object getRemarks() {
+            return remarks;
+        }
+
+        public void setRemarks(Object remarks) {
+            this.remarks = remarks;
+        }
+
+        public Object getCreateBy() {
+            return createBy;
+        }
+
+        public void setCreateBy(Object createBy) {
+            this.createBy = createBy;
+        }
+
+        public Object getLoginName() {
+            return loginName;
+        }
+
+        public void setLoginName(Object loginName) {
+            this.loginName = loginName;
+        }
+
+        public String getCreateByName() {
+            return createByName;
+        }
+
+        public void setCreateByName(String createByName) {
+            this.createByName = createByName;
+        }
+
+        public Object getDelete() {
+            return delete;
+        }
+
+        public void setDelete(Object delete) {
+            this.delete = delete;
+        }
+    }
+}

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

@@ -55,6 +55,7 @@ public interface MesApiService {
      */
     @POST("/himes/api/msJobTypeInfo/show/list.json")
     Observable<BaseMesBean> jobTypeChild(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
      * 日志
      *
@@ -100,7 +101,22 @@ public interface MesApiService {
      *
      * @return
      */
-    @POST("/himes/api/msWorkOrder/accept.json?")
+    @POST("/himes/api/msWorkOrder/accept.json")
     Observable<BaseMesBean> receiveTicket(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+    /**
+     * 产品
+     *
+     * @return
+     */
+    @POST("/himes/api/product/show/list.json")
+    Observable<BaseMesBean> proList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+    /**
+     * 产品
+     *
+     * @return
+     */
+    @POST("/himes/api/user/noClear/show/page.json")
+    Observable<BaseMesBean> takeOnList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddSummaryActivity.java

 package com.wd.workoffice.ui.activity.mes.ticket;
 
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
@@ -11,19 +13,25 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.mesBean.MesClientBean;
+import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.util.DialogUtils;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.Map;
 
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
 import io.reactivex.disposables.Disposable;
 
@@ -94,12 +102,24 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
     RecyclerView rvAnnx;
     private Map<String, Object> param;
     private TicketBean.ListBean data;
+    private QMUIDialog.MenuDialogBuilder proDialog;
+    private MesProBean.ListBean choosePro;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
         data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
         changVisibility(data.getJobTypeId());
+        proDialog = DialogUtils.listDialog(this);
+        proDialog.addItems(new String[]{"是", "否"}, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (which == 0)
+                    param.put("productDrawingConfirmation", 1);
+                else
+                    param.put("productDrawingConfirmation", 0);
+            }
+        });
     }
 
 
@@ -110,7 +130,34 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
     }
 
     private void submit() {
-        RtfUtils.getMesRtf().summaryAdd("", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        if (TextUtils.equals(data.getJobTypeId(), "01")) {
+            param.put("siteInvestigation", etDesign1.getText().toString());
+            param.put("feasibilityReport", etDesign2.getText().toString());
+        } else if (TextUtils.equals(data.getJobTypeId(), "02")) {
+            param.put("experimentProcess", etTry1.getText().toString());
+            param.put("experimentResult", etTry2.getText().toString());
+            param.put("improveProposal", etTry3.getText().toString());
+        } else if (TextUtils.equals(data.getJobTypeId(), "03")) {
+            param.put("feedbackQualityIssues", etQuality1.getText().toString());
+            param.put("siteUseSituation", etQuality2.getText().toString());
+            param.put("causeAnalysis", etQuality3.getText().toString());
+            param.put("solution", etQuality4.getText().toString());
+        } else if (TextUtils.equals(data.getJobTypeId(), "04")) {
+            param.put("communicativePurposes", etTech1.getText().toString());
+            param.put("communicativeSituation", etTech2.getText().toString());
+            param.put("reachOpinion", etTech3.getText().toString());
+        } else if (TextUtils.equals(data.getJobTypeId(), "05")) {
+            param.put("productDevise", etTender1.getText().toString());
+            param.put("productQuotedPrice", etTender2.getText().toString());
+        }
+        if (!TextUtils.equals(data.getJobTypeId(), "01") && !TextUtils.equals(data.getJobTypeId(), "05")) {
+            if (choosePro != null) {
+                param.put("productsCode", choosePro.getProductCode());
+                param.put("productsName", choosePro.getProductName());
+            }
+        }
+        param.put("completionSituation", etClient.getText().toString());
+        RtfUtils.getMesRtf().summaryAdd("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
 
 
             @Override
@@ -172,4 +219,34 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
             llTender.setVisibility(View.VISIBLE);
         }
     }
+
+
+    @OnClick({R.id.rl_quality_pro, R.id.ll_design, R.id.rl_try_pro, R.id.rl_tech_pro})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.ll_design:
+                proDialog.show();
+                break;
+            case R.id.rl_try_pro:
+                startActivityForResult(MesTicketProActivity.class, 10001);
+                break;
+            case R.id.rl_tech_pro:
+                startActivityForResult(MesTicketProActivity.class, 10001);
+                break;
+            case R.id.rl_quality_pro:
+                startActivityForResult(MesTicketProActivity.class, 10001);
+                break;
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 10001 && resultCode == 10001) {
+            choosePro = JSON.parseObject(data.getStringExtra("data"), MesProBean.ListBean.class);
+            tvQualityPro.setText(choosePro.getProductName());
+            tvTechPro.setText(choosePro.getProductName());
+            tvTryPro.setText(choosePro.getProductName());
+        }
+    }
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java

@@ -180,7 +180,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 switch (dataList.get(position).getJobStatus()) {
                     case 0:
-                        startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));
+                        startActivity(MesTicketAddActivity.class, "data", JSON.toJSONString(dataList.get(position)));
                         break;
                     case 1:
                         startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketProActivity.java

+package com.wd.workoffice.ui.activity.mes.ticket;
+
+import android.content.Intent;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.mesBean.MesClientBean;
+import com.wd.workoffice.bean.mesBean.MesProBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.MesClientAdapter;
+import com.wd.workoffice.ui.adapter.MesProAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+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 MesTicketProActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.btn_search)
+    Button btnSearch;
+    @BindView(R.id.rv_client)
+    RecyclerView rvClient;
+    private Map<String, Object> param;
+    private List<MesProBean.ListBean> clientList;
+    private MesProAdapter clientAdapter;
+    private int page = 1;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+
+    }
+
+    @Override
+    protected void initData() {
+        clientList = new ArrayList<>();
+        clientAdapter = new MesProAdapter(R.layout.item_store_client, clientList);
+        clientAdapter.bindToRecyclerView(rvClient);
+        clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
+        param = WorkUtils.pageMesKey();
+        param.put("pageNum", 1);
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().clientList("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<MesProBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesProBean.class).getList();
+                if (page == 1) {
+                    clientList.clear();
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                    clientAdapter.loadMoreComplete();
+                } else {
+                    clientAdapter.loadMoreComplete();
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    clientAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+                toast("搜索成功");
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("pageNum", page);
+                getData();
+            }
+        }, rvClient);
+        clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                Intent intent = new Intent();
+                intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
+                setResult(10001, intent);
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_take_on;
+    }
+
+
+    @OnClick(R.id.btn_search)
+    public void onViewClicked() {
+        param.put("name", etKey.getText().toString());
+        param.put("pageNum", 1);
+        page = 1;
+        getData();
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketTakeOnActivity.java

+package com.wd.workoffice.ui.activity.mes.ticket;
+
+import android.content.Intent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.mesBean.MesProBean;
+import com.wd.workoffice.bean.mesBean.TakeOnBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.MesProAdapter;
+import com.wd.workoffice.ui.adapter.MesTakeOnAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+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 MesTicketTakeOnActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.btn_search)
+    Button btnSearch;
+    @BindView(R.id.rv_client)
+    RecyclerView rvClient;
+    private Map<String, Object> param;
+    private List<TakeOnBean.ListBean> clientList;
+    private MesTakeOnAdapter clientAdapter;
+    private int page = 1;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+
+    }
+
+    @Override
+    protected void initData() {
+        clientList = new ArrayList<>();
+        clientAdapter = new MesTakeOnAdapter(R.layout.item_store_client, clientList);
+        clientAdapter.bindToRecyclerView(rvClient);
+        clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
+        param = WorkUtils.pageMesKey();
+        param.put("pageNum", 1);
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().takeOnList("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<TakeOnBean.ListBean> getList = JSON.parseObject(data.getData().toString(), TakeOnBean.class).getList();
+                if (page == 1) {
+                    clientList.clear();
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                    clientAdapter.loadMoreComplete();
+                } else {
+                    clientAdapter.loadMoreComplete();
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    clientAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+                toast("搜索成功");
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("pageNum", page);
+                getData();
+            }
+        }, rvClient);
+        clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                Intent intent = new Intent();
+                intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
+                setResult(10002, intent);
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_take_on;
+    }
+
+
+    @OnClick(R.id.btn_search)
+    public void onViewClicked() {
+        param.put("name", etKey.getText().toString());
+        param.put("pageNum", 1);
+        page = 1;
+        getData();
+    }
+}

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

+package com.wd.workoffice.ui.adapter;
+
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.mesBean.MesClientBean;
+import com.wd.workoffice.bean.mesBean.MesProBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class MesProAdapter extends BaseQuickAdapter<MesProBean.ListBean, BaseViewHolder> {
+    public MesProAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, MesProBean.ListBean item) {
+        helper.setText(R.id.tv_name, item.getProductName());
+    }
+}
+

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

+package com.wd.workoffice.ui.adapter;
+
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.mesBean.MesProBean;
+import com.wd.workoffice.bean.mesBean.TakeOnBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class MesTakeOnAdapter extends BaseQuickAdapter<TakeOnBean.ListBean, BaseViewHolder> {
+    public MesTakeOnAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, TakeOnBean.ListBean item) {
+        helper.setText(R.id.tv_name, item.getName());
+    }
+}
+

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

@@ -49,29 +49,6 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="20mm"
-                android:paddingVertical="9mm"
-                android:visibility="gone">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="单号:"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/tv_code"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10mm"
-                    android:textSize="14sp" />
-            </LinearLayout>
-
-            <View style="@style/dividerX" />
-
             <RelativeLayout
                 android:id="@+id/rl_client"
                 android:layout_width="match_parent"
@@ -200,6 +177,7 @@
                 android:paddingVertical="9mm">
 
                 <TextView
+                    android:id="@+id/tv_mark"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
@@ -210,6 +188,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
+                    android:layout_toRightOf="@id/tv_mark"
                     android:gravity="right"
                     android:orientation="vertical">
 
@@ -274,8 +253,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="20mm"
-                android:paddingVertical="9mm"
-                android:visibility="gone">
+                android:paddingVertical="9mm">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -390,79 +368,6 @@
 
             <View style="@style/dividerX" />
 
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="20mm"
-                android:paddingVertical="9mm">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="制单人"
-                    android:textSize="14sp" />
-
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="20mm"
-                    android:gravity="center"
-                    android:padding="3mm"
-                    android:textColor="@color/flexible_text_gray"
-                    android:textSize="14sp" />
-
-                <ImageView
-                    android:layout_width="13mm"
-                    android:layout_height="13mm"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:src="@mipmap/ticket_close" />
-            </RelativeLayout>
-
-            <View style="@style/dividerX" />
-
-            <RelativeLayout
-                android:id="@+id/rl_time"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="20mm"
-                android:paddingVertical="9mm">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:text="制单日期"
-                    android:textSize="14sp" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:gravity="center_vertical">
-
-                    <TextView
-                        android:id="@+id/tv_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_marginRight="3mm"
-                        android:text="请选择"
-                        android:textColor="@color/flexible_text_gray"
-                        android:textSize="14sp" />
-
-                    <ImageView
-                        android:layout_width="15mm"
-                        android:layout_height="20mm"
-                        android:src="@mipmap/arrow_right_gray" />
-                </LinearLayout>
-            </RelativeLayout>
-
-            <View style="@style/dividerX" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 

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

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="10mm"
+    android:layout_marginRight="5mm"
     android:orientation="vertical">
 
     <TextView