1.日志新增

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

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

+package com.wd.workoffice.bean.mesBean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class LogBean {
+
+    /**
+     * id : 49
+     * createDateTime : 1587906695000
+     * updateDateTime : 1587906695000
+     * jobNo : 40
+     * logDateTime : 2020-04-26 21:11:35
+     * writeUserId : 398c852b38e911ea8334fa163e1166bd
+     * writeUserName : hello
+     * jobContent : null
+     * problemDescription : null
+     * customerDemand : null
+     * createUserId : 398c852b38e911ea8334fa163e1166bd
+     * createUserName : null
+     * updateUserId : null
+     * updateUserName : null
+     * approvalUserId : null
+     * approvalUserName : null
+     * approvalDateTime : null
+     * approvalStatus : null
+     * remark : null
+     * attachments : []
+     * delete : null
+     */
+
+    private String id;
+    private long createDateTime;
+    private long updateDateTime;
+    private String jobNo;
+    private String logDateTime;
+    private String writeUserId;
+    private String writeUserName;
+    private String jobContent;
+    private String problemDescription;
+    private String customerDemand;
+    private String createUserId;
+    private String createUserName;
+    private String updateUserId;
+    private String updateUserName;
+    private String approvalUserId;
+    private String approvalUserName;
+    private String approvalDateTime;
+    private String approvalStatus;
+    private String remark;
+    private String delete;
+    private List<?> attachments;
+
+    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 long getUpdateDateTime() {
+        return updateDateTime;
+    }
+
+    public void setUpdateDateTime(long updateDateTime) {
+        this.updateDateTime = updateDateTime;
+    }
+
+    public String getJobNo() {
+        return jobNo;
+    }
+
+    public void setJobNo(String jobNo) {
+        this.jobNo = jobNo;
+    }
+
+    public String getLogDateTime() {
+        return logDateTime;
+    }
+
+    public void setLogDateTime(String logDateTime) {
+        this.logDateTime = logDateTime;
+    }
+
+    public String getWriteUserId() {
+        return writeUserId;
+    }
+
+    public void setWriteUserId(String writeUserId) {
+        this.writeUserId = writeUserId;
+    }
+
+    public String getWriteUserName() {
+        return writeUserName;
+    }
+
+    public void setWriteUserName(String writeUserName) {
+        this.writeUserName = writeUserName;
+    }
+
+    public String getJobContent() {
+        return jobContent;
+    }
+
+    public void setJobContent(String jobContent) {
+        this.jobContent = jobContent;
+    }
+
+    public String getProblemDescription() {
+        return problemDescription;
+    }
+
+    public void setProblemDescription(String problemDescription) {
+        this.problemDescription = problemDescription;
+    }
+
+    public String getCustomerDemand() {
+        return customerDemand;
+    }
+
+    public void setCustomerDemand(String customerDemand) {
+        this.customerDemand = customerDemand;
+    }
+
+    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 String getUpdateUserName() {
+        return updateUserName;
+    }
+
+    public void setUpdateUserName(String updateUserName) {
+        this.updateUserName = updateUserName;
+    }
+
+    public String getApprovalUserId() {
+        return approvalUserId;
+    }
+
+    public void setApprovalUserId(String approvalUserId) {
+        this.approvalUserId = approvalUserId;
+    }
+
+    public String getApprovalUserName() {
+        return approvalUserName;
+    }
+
+    public void setApprovalUserName(String approvalUserName) {
+        this.approvalUserName = approvalUserName;
+    }
+
+    public String getApprovalDateTime() {
+        return approvalDateTime;
+    }
+
+    public void setApprovalDateTime(String approvalDateTime) {
+        this.approvalDateTime = approvalDateTime;
+    }
+
+    public String getApprovalStatus() {
+        return approvalStatus;
+    }
+
+    public void setApprovalStatus(String approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getDelete() {
+        return delete;
+    }
+
+    public void setDelete(String delete) {
+        this.delete = delete;
+    }
+
+    public List<?> getAttachments() {
+        return attachments;
+    }
+
+    public void setAttachments(List<?> attachments) {
+        this.attachments = attachments;
+    }
+}

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

@@ -37,6 +37,7 @@ public interface MesApiService {
      */
     @POST("/himes/api/msWorkOrder/save.json")
     Observable<BaseMesBean> tickeAdd(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
      * 功能
      *
@@ -44,4 +45,20 @@ public interface MesApiService {
      */
     @POST("/himes/api/msJobTypeInfo/show/list.json")
     Observable<BaseMesBean> jobType(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+    /**
+     * 日志
+     *
+     * @return
+     */
+    @POST("/himes/api/msWorkLogReport/show/listApp.json")
+    Observable<BaseMesBean> logList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+    /**
+     * 功能
+     *
+     * @return
+     */
+    @POST("/himes/api/msWorkLogReport/save.json")
+    Observable<BaseMesBean> logAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 }

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

@@ -8,10 +8,15 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 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.AccountBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.Arrays;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -37,7 +42,7 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
     EditText etQuestionDesc;
     @BindView(R.id.et_client)
     EditText etClient;
-    private AccountBean dataBean;
+    private Map<String, Object> param;
 
     @Override
     protected void initView() {
@@ -46,11 +51,12 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
-        getData();
+        param = WorkUtils.simpleParam();
+        param.put("jobNo", getIntent().getStringExtra("id"));
     }
 
-    private void getData() {
-        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+    private void submit() {
+        RtfUtils.getMesRtf().logAdd("", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
 
 
             @Override
@@ -64,17 +70,12 @@ public class MesTicketAddLogActivity 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;
                 }
-                dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
-//                tvName.setText(dataBean.getName());
-//                tvDpeName.setText(dataBean.getName());
-//                tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
-//                tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
             }
         });
     }
@@ -98,6 +99,14 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.report:
+                String client = etClient.getText().toString();
+                String content = etContent.getText().toString();
+                String desc = etQuestionDesc.getText().toString();
+                param.put("customerDemand", client);
+                param.put("jobContent", content);
+                param.put("problemDescription", desc);
+//                param.put("attachments", Arrays.asList("https://image.baidu.com/search/redirect?tn=redirect&word=j&juid=60A17C&sign=ckwboawzac&url=http%3A%2F%2Fwww.he-nan.com%2Fwtx%2Fswaxd%2Fnew-126233.html&bakfurl1=http%3A%2F%2Fwww.jnhsgc.com%2Fwtx%2Fswaxd%2Fshow%2F2188241.html&bakfurl2=http%3A%2F%2Fwww.10huan.com%2Fwtx%2Fswaxd%2Fnew-1240701.html&objurl=https%3A%2F%2Ftimgsa.baidu.com%2Ftimg%3Fimage%26quality%3D80%26size%3Db9999_10000%26sec%3D1587918679912%26di%3D8f01c77314881dad317d1cbda58cd0bf%26imgtype%3D0%26src%3Dhttp%253A%252F%252Fimg.yzt-tools.com%252F20190218%252Fca736a78109decf300cbaf239cc32545.jpg"));
+                submit();
                 break;
         }
         return super.onOptionsItemSelected(item);

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

@@ -193,10 +193,10 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
                 startActivity(MesTicketAddSummaryActivity.class);
                 break;
             case R.id.rl_log:
-                startActivity(MesTicketLogActivity.class);
+                startActivity(MesTicketLogActivity.class, "id", data.getId() + "");
                 break;
             case R.id.rl_add_log:
-                startActivity(MesTicketAddLogActivity.class);
+                startActivity(MesTicketAddLogActivity.class, "id", data.getId() + "");
                 break;
         }
     }

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

@@ -174,6 +174,9 @@ public class MesTicketListActivity extends WorkToolBarActivity {
             @Override
             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)));
+                        break;
                     case 1:
                         startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));
                         break;

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

@@ -7,8 +7,10 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 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.ProPriceBean;
+import com.wd.workoffice.bean.mesBean.LogBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.MesTicketLogAdapter;
@@ -42,7 +44,6 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
     private Map<String, Object> param;
     private List<Object> dataList;
     private MesTicketLogAdapter dataAdapter;
-    private int page = 1;
 
     @Override
     protected void initView() {
@@ -56,18 +57,14 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
         dataList = new ArrayList<>();
         dataAdapter = new MesTicketLogAdapter(R.layout.item_mes_ticket_log, dataList);
         dataAdapter.bindToRecyclerView(rvData);
-        dataAdapter.setEmptyView(R.layout.view_empty_content,rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
         param = WorkUtils.pageKey();
-        param.put("productId", getIntent().getStringExtra("id"));
-        param.put("current", page);
-//        getData();
-        dataList.add(new Object());
-        dataList.add(new Object());
-        dataAdapter.notifyDataSetChanged();
+        param.put("jobNo", getIntent().getStringExtra("id"));
+        getData();
     }
 
     private void getData() {
-        RtfUtils.getRtf().getProHistoryPrice(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getMesRtf().logList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -79,30 +76,17 @@ public class MesTicketLogActivity 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<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();
-
-                if (page == 1) {
-                    srlRefresh.finishRefresh();
-                    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++;
-                }
+                List<LogBean> getList = JSON.parseArray(data.getData().toString(), LogBean.class);
+                srlRefresh.finishRefresh();
+                dataList.clear();
+                dataList.addAll(getList);
+                dataAdapter.notifyDataSetChanged();
             }
         });
     }
@@ -113,18 +97,9 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
         srlRefresh.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                page = 1;
-                param.put("current", page);
                 getData();
             }
         });
-        dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
-            @Override
-            public void onLoadMoreRequested() {
-                param.put("current", page);
-                getData();
-            }
-        }, rvData);
     }
 
     @Override

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

@@ -7,6 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.ProPriceBean;
+import com.wd.workoffice.bean.mesBean.LogBean;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,7 +19,7 @@ import androidx.recyclerview.widget.RecyclerView;
  * Created by flexible on 2018/8/13.
  */
 
-public class MesTicketLogAdapter extends BaseQuickAdapter<Object, BaseViewHolder> {
+public class MesTicketLogAdapter extends BaseQuickAdapter<LogBean, BaseViewHolder> {
 
     public MesTicketLogAdapter(int layoutResId, List data) {
         super(layoutResId, data);
@@ -26,16 +27,18 @@ public class MesTicketLogAdapter extends BaseQuickAdapter<Object, BaseViewHolder
 
 
     @Override
-    protected void convert(BaseViewHolder helper, Object item) {
+    protected void convert(BaseViewHolder helper, LogBean item) {
         RecyclerView rvImg = helper.getView(R.id.rv_img);
         rvImg.setLayoutManager(new LinearLayoutManager(helper.getConvertView().getContext(), RecyclerView.HORIZONTAL
                 , false));
-        List imgList = new ArrayList<>();
-        imgList.add(null);
-        imgList.add(null);
-        imgList.add(null);
+        List imgList = item.getAttachments();
         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_content, item.getJobContent());
+        helper.setText(R.id.tv_desc, item.getProblemDescription());
+        helper.setText(R.id.tv_apply, item.getCustomerDemand());
     }
 }
 

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

@@ -19,6 +19,7 @@
             android:id="@+id/btn_receive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginRight="20mm"
             android:background="@drawable/shape_blue_circle"
             android:paddingHorizontal="40mm"
             android:text="接收"

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

@@ -21,7 +21,7 @@
 
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="单号:"
+                android:text="单号"
                 android:textSize="14sp" />
 
             <TextView
@@ -143,6 +143,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="20mm"
             android:layout_marginTop="3mm"
+            android:layout_marginBottom="10mm"
             android:background="@drawable/shape_input_white"
             android:gravity="top"
             android:minLines="3"
@@ -151,7 +152,6 @@
 
         <View style="@style/ViewX" />
 
-        <View style="@style/ViewX" />
 
         <TextView
             android:layout_width="match_parent"

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

@@ -17,6 +17,7 @@
             android:background="@drawable/shape_blue_circle" />
 
         <TextView
+            android:id="@+id/tv_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5mm"
@@ -25,6 +26,7 @@
             android:textStyle="bold" />
 
         <TextView
+            android:id="@+id/tv_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20mm"
@@ -43,6 +45,7 @@
         android:textSize="15sp" />
 
     <TextView
+        android:id="@+id/tv_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="35mm"
@@ -61,6 +64,7 @@
         android:textSize="15sp" />
 
     <TextView
+        android:id="@+id/tv_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="35mm"
@@ -79,6 +83,7 @@
         android:textSize="15sp" />
 
     <TextView
+        android:id="@+id/tv_apply"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="35mm"