1.新增

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

app/src/main/AndroidManifest.xml

@@ -1273,7 +1273,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
-
+        <activity
+            android:name=".ui.activity.mes.ticket.MesTicketClientActivity"
+            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/app/WorkApp.java

@@ -51,7 +51,7 @@ public class WorkApp extends BaseApp {
         RtfMesHelper.getInstance().init(MesApiService.DOMAIN, chain -> {
             Request original = chain.request();
             Request request = original.newBuilder()
-                    .header("Cookie", "SESSION=ca4aabe3-4ef2-479e-b315-6238899edaa8")
+                    .header("Cookie", "SESSION=4eb12da5-803b-46b5-be06-49a2d6512baa")
                     .method(original.method(), original.body())
                     .build();
 

app/src/main/java/com/wd/workoffice/bean/event/AddTicketEvent.java

+package com.wd.workoffice.bean.event;
+
+import com.wd.workoffice.bean.DepBean;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class AddTicketEvent {
+
+    public AddTicketEvent() {
+    }
+}

app/src/main/java/com/wd/workoffice/bean/mesBean/MesClientBean.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 MesClientBean 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 : 245
+         * isDelete : null
+         * createDateTime : 1585036996000
+         * updateDateTime : null
+         * customerCode : KN00185
+         * customerName : 西宁特殊钢股份有限公司
+         * salesCompanyCode : GK31
+         * salesCompanyName : 销售六公司
+         * salesManagerCode : EM1606001
+         * salesManagerName : 袁安波
+         * createUserId : BAT
+         * createUserName :
+         * updateUserId :
+         * updateUserName : null
+         * remark :
+         * delete : null
+         */
+
+        private String id;
+        private Object isDelete;
+        private long createDateTime;
+        private Object updateDateTime;
+        private String customerCode;
+        private String customerName;
+        private String salesCompanyCode;
+        private String salesCompanyName;
+        private String salesManagerCode;
+        private String salesManagerName;
+        private String createUserId;
+        private String createUserName;
+        private String updateUserId;
+        private Object updateUserName;
+        private String remark;
+        private Object delete;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public Object getIsDelete() {
+            return isDelete;
+        }
+
+        public void setIsDelete(Object isDelete) {
+            this.isDelete = isDelete;
+        }
+
+        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 getCustomerCode() {
+            return customerCode;
+        }
+
+        public void setCustomerCode(String customerCode) {
+            this.customerCode = customerCode;
+        }
+
+        public String getCustomerName() {
+            return customerName;
+        }
+
+        public void setCustomerName(String customerName) {
+            this.customerName = customerName;
+        }
+
+        public String getSalesCompanyCode() {
+            return salesCompanyCode;
+        }
+
+        public void setSalesCompanyCode(String salesCompanyCode) {
+            this.salesCompanyCode = salesCompanyCode;
+        }
+
+        public String getSalesCompanyName() {
+            return salesCompanyName;
+        }
+
+        public void setSalesCompanyName(String salesCompanyName) {
+            this.salesCompanyName = salesCompanyName;
+        }
+
+        public String getSalesManagerCode() {
+            return salesManagerCode;
+        }
+
+        public void setSalesManagerCode(String salesManagerCode) {
+            this.salesManagerCode = salesManagerCode;
+        }
+
+        public String getSalesManagerName() {
+            return salesManagerName;
+        }
+
+        public void setSalesManagerName(String salesManagerName) {
+            this.salesManagerName = salesManagerName;
+        }
+
+        public String getCreateUserId() {
+            return createUserId;
+        }
+
+        public void setCreateUserId(String createUserId) {
+            this.createUserId = createUserId;
+        }
+
+        public String getCreateUserName() {
+            return createUserName;
+        }
+
+        public void setCreateUserName(String createUserName) {
+            this.createUserName = createUserName;
+        }
+
+        public String getUpdateUserId() {
+            return updateUserId;
+        }
+
+        public void setUpdateUserId(String updateUserId) {
+            this.updateUserId = updateUserId;
+        }
+
+        public Object getUpdateUserName() {
+            return updateUserName;
+        }
+
+        public void setUpdateUserName(Object updateUserName) {
+            this.updateUserName = updateUserName;
+        }
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
+
+        public Object getDelete() {
+            return delete;
+        }
+
+        public void setDelete(Object delete) {
+            this.delete = delete;
+        }
+    }
+}

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

@@ -37,16 +37,24 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/msWorkOrder/save.json")
-    Observable<BaseMesBean> tickeAdd(@Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> ticketAdd(@Query("functionId") String functionId,
+                                      @Query("option") String option,    @Body RequestBody requestBody);
 
     /**
-     * 功能
+     * 任务类型-父类
      *
      * @return
      */
-    @POST("/himes/api/msJobTypeInfo/show/list.json")
-    Observable<BaseMesBean> jobType(@Query("functionId") String functionId, @Body RequestBody requestBody);
+    @POST("/himes/api/msJobTypeInfo/show/parentlist.json")
+    Observable<BaseMesBean> jobType(@Query("functionId") String functionId);
 
+    /**
+     * 任务类型
+     *
+     * @return
+     */
+    @POST("/himes/api/msJobTypeInfo/show/list.json")
+    Observable<BaseMesBean> jobTypeChild(@Query("functionId") String functionId, @Body RequestBody requestBody);
     /**
      * 日志
      *
@@ -78,4 +86,12 @@ public interface MesApiService {
      */
     @POST("/himes/api/msWorkSummary/save.json")
     Observable<BaseMesBean> summaryAdd(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+    /**
+     * 工作总结新增
+     *
+     * @return
+     */
+    @POST("/himes/api/msCustomerSales/show/page.json")
+    Observable<BaseMesBean> clientList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 }

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

@@ -10,11 +10,15 @@ import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.ClientBean;
+import com.wd.workoffice.bean.mesBean.MesClientBean;
+import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
 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.StoreClientAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -32,12 +36,12 @@ import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
- * 任务担当
+ * 选择客户
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class MesTicketTakeOnActivity extends WorkToolBarActivity {
+public class MesTicketClientActivity extends WorkToolBarActivity {
 
     @BindView(R.id.et_key)
     EditText etKey;
@@ -46,8 +50,8 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
     @BindView(R.id.rv_client)
     RecyclerView rvClient;
     private Map<String, Object> param;
-    private List<ClientBean.RecordsBean> clientList;
-    private StoreClientAdapter clientAdapter;
+    private List<MesClientBean.ListBean> clientList;
+    private MesClientAdapter clientAdapter;
     private int page = 1;
 
     @Override
@@ -62,36 +66,17 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
         if (!TextUtils.isEmpty(getIntent().getStringExtra("supplier"))) {
             setTitle(getIntent().getStringExtra("supplier"));
         }
-
         clientList = new ArrayList<>();
-        clientAdapter = new StoreClientAdapter(R.layout.item_store_client, clientList);
+        clientAdapter = new MesClientAdapter(R.layout.item_store_client, clientList);
         clientAdapter.bindToRecyclerView(rvClient);
         clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
-        param = WorkUtils.pageKey();
-        if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-            param.put("partTypeCode", getIntent().getStringExtra("code"));
-        } else {
-            param.put("searchType", getIntent().getStringExtra("code"));
-        }
-        String depId = getIntent().getStringExtra("depId");
-        if (!TextUtils.isEmpty(depId)) {
-            param.put("deptId", depId);
-        }
-        if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_MANAGE_LIST.getPermission())) {
-            toast(R.string.permission);
-        } else {
-            getData();
-        }
+        param = WorkUtils.pageMesKey();
+        param.put("pageNum", 1);
+        getData();
     }
 
     private void getData() {
-        Observable<BaseBean> observable;
-        if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-            observable = RtfUtils.getRtf().getClient(param);
-        } else {
-            observable = RtfUtils.getRtf().getClientOut(param);
-        }
-        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getMesRtf().clientList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -103,40 +88,27 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
             }
 
             @Override
-            public void onSuccess(BaseBean data) {
+            public void onSuccess(BaseMesBean data) {
                 hideLoading();
-                if (data.getCode() != 0) {
+                if (!data.isSuccess()) {
                     toast(data.getMessage());
                     return;
                 }
-                List<ClientBean.RecordsBean> dataList = new ArrayList<>();
-                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-                    ClientBean clientBean = JSON.parseObject(data.getData().toString(), ClientBean.class);
-                    dataList.addAll(clientBean.getRecords());
-                    if (page == 1) {
-                        clientList.clear();
-                        clientList.addAll(dataList);
-                        clientAdapter.notifyDataSetChanged();
-                        clientAdapter.loadMoreComplete();
-                    } else {
-                        clientAdapter.loadMoreComplete();
-                        clientList.addAll(dataList);
-                        clientAdapter.notifyDataSetChanged();
-                    }
-                    if (dataList.size() == 0) {
-                        clientAdapter.loadMoreEnd();
-                    } else {
-                        page++;
-                    }
-                } else {
-                    dataList.addAll(JSON.parseArray(data.getData().toString(), ClientBean.RecordsBean.class));
-                    clientAdapter.loadMoreEnd();
+                List<MesClientBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesClientBean.class).getList();
+                if (page == 1) {
                     clientList.clear();
-                    clientList.addAll(dataList);
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                    clientAdapter.loadMoreComplete();
+                } else {
+                    clientAdapter.loadMoreComplete();
+                    clientList.addAll(getList);
                     clientAdapter.notifyDataSetChanged();
                 }
-                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-
+                if (getList.size() == 0) {
+                    clientAdapter.loadMoreEnd();
+                } else {
+                    page++;
                 }
                 toast("搜索成功");
             }
@@ -148,7 +120,7 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
         clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
             @Override
             public void onLoadMoreRequested() {
-                param.put("current", page);
+                param.put("pageNum", page);
                 getData();
             }
         }, rvClient);
@@ -156,8 +128,7 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 Intent intent = new Intent();
-                intent.putExtra("clientName", clientList.get(position).getName());
-                intent.putExtra("id", clientList.get(position).getId());
+                intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
                 setResult(10001, intent);
                 finish();
             }
@@ -173,7 +144,7 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
     @OnClick(R.id.btn_search)
     public void onViewClicked() {
         param.put("name", etKey.getText().toString());
-        param.put("current", 1);
+        param.put("pageNum", 1);
         page = 1;
         getData();
     }

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

@@ -112,7 +112,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
     private void getType(String id) {
         Map<String, Object> param = WorkUtils.simpleParam();
         param.put("jobTypeCode", id);
-        RtfUtils.getMesRtf().jobType("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        RtfUtils.getMesRtf().jobTypeChild("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
 
             @Override
             public void doOnSubscribe(Disposable d) {

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

@@ -13,6 +13,8 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.AddDepEvent;
+import com.wd.workoffice.bean.event.AddTicketEvent;
 import com.wd.workoffice.bean.listener.FourMenuClickListener;
 import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -22,6 +24,9 @@ import com.wd.workoffice.util.WorkUtils;
 import com.wd.workoffice.util.ddmfilter.MesTicketListFilterData;
 import com.wd.workoffice.widget.DropDownMenu;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -216,4 +221,23 @@ public class MesTicketListActivity extends WorkToolBarActivity {
         startActivity(MesTicketListTakeOnActivity.class);
         finish();
     }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(AddTicketEvent event) {
+        page = 1;
+        param.put("pageNum", page);
+        getData();
+    }
 }

app/src/main/java/com/wd/workoffice/ui/adapter/MesClientAdapter.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.ClientBean;
+import com.wd.workoffice.bean.mesBean.MesClientBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class MesClientAdapter extends BaseQuickAdapter<MesClientBean.ListBean, BaseViewHolder> {
+    public MesClientAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, MesClientBean.ListBean item) {
+        helper.setText(R.id.tv_name, item.getCustomerName());
+    }
+}
+

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

@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.MsgBean;
 import com.wd.workoffice.bean.mesBean.TicketBean;
+import com.wd.workoffice.util.WorkUtils;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public class MesTicketAdapter extends BaseQuickAdapter<TicketBean.ListBean, Base
     protected void convert(BaseViewHolder helper, TicketBean.ListBean item) {
         helper.setText(R.id.tv_name, item.getCustomerUserName());
         helper.setText(R.id.tv_pro_name, item.getJobTypeName());
-        helper.setText(R.id.tv_status, item.getJobStatus() + "");
+        helper.setText(R.id.tv_status, WorkUtils.getTicketStatus(item.getJobStatus()));
         helper.setText(R.id.tv_time, item.getCreateDateTime());
     }
 }

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

@@ -35,7 +35,7 @@ public class MesTicketLogAdapter extends BaseQuickAdapter<LogBean, BaseViewHolde
         ImgAdapter imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
         imgAdapter.bindToRecyclerView(rvImg);
         helper.setText(R.id.tv_time, item.getLogDateTime());
-        helper.setText(R.id.tv_name, item.getCreateUserName());
+        helper.setText(R.id.tv_name, item.getWriteUserName());
         helper.setText(R.id.tv_content, item.getJobContent());
         helper.setText(R.id.tv_desc, item.getProblemDescription());
         helper.setText(R.id.tv_apply, item.getCustomerDemand());

app/src/main/java/com/wd/workoffice/util/WorkUtils.java

@@ -250,6 +250,29 @@ public class WorkUtils {
         return name;
     }
 
+    // 0草稿、1已提交、2执行中、3已总结、4已评价
+    public static String getTicketStatus(Integer code) {
+        String name = "";
+        switch (code) {
+            case 0:
+                name = "草稿";
+                break;
+            case 1:
+                name = "已提交";
+                break;
+            case 2:
+                name = "执行中";
+                break;
+            case 3:
+                name = "已总结";
+                break;
+            case 4:
+                name = "已评价";
+                break;
+        }
+        return name;
+    }
+
     /**
      * 刷新token
      *

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

@@ -53,10 +53,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="20mm"
-                android:paddingVertical="9mm">
+                android:paddingVertical="9mm"
+                android:visibility="gone">
 
                 <TextView
-
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="单号:"
@@ -193,6 +193,7 @@
             <View style="@style/ViewX" />
 
             <RelativeLayout
+                android:id="@+id/rl_job"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="20mm"
@@ -202,30 +203,43 @@
                     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_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:gravity="center_vertical">
+                    android:gravity="right"
+                    android:orientation="vertical">
 
-                    <TextView
+                    <LinearLayout
                         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" />
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            android:id="@+id/tv_job"
+                            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>
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_job"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
                 </LinearLayout>
+
             </RelativeLayout>
 
             <View style="@style/dividerX" />
@@ -260,7 +274,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="20mm"
-                android:paddingVertical="9mm">
+                android:paddingVertical="9mm"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -317,6 +332,7 @@
                     android:background="@null"
                     android:gravity="right"
                     android:hint="请输入"
+                    android:inputType="number"
                     android:padding="3mm"
                     android:textColor="@color/flexible_text_gray"
                     android:textSize="14sp" />