1.添加日志差图片，展示差图片

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

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

@@ -11,6 +11,8 @@ 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.bean.mesBean.LogBean;
+import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.util.WorkUtils;
@@ -43,20 +45,25 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
     @BindView(R.id.et_client)
     EditText etClient;
     private Map<String, Object> param;
+    private TicketBean.ListBean data;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
+        data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
+        tvCode.setText(data.getJobNo());
+        tvTime.setText(data.getCreateDateTime());
+        tvCreatePerson.setText(data.getCreateUserName());
     }
 
     @Override
     protected void initData() {
         param = WorkUtils.simpleParam();
-        param.put("jobNo", getIntent().getStringExtra("id"));
+        param.put("jobNo", data.getJobNo());
     }
 
     private void submit() {
-        RtfUtils.getMesRtf().logAdd("", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        RtfUtils.getMesRtf().logAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
 
 
             @Override
@@ -76,6 +83,8 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
+                finish();
+                toast("添加成功");
             }
         });
     }

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

@@ -107,6 +107,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
         } else {
             rlAddLog.setVisibility(View.GONE);
         }
+        rlAddLog.setVisibility(View.VISIBLE);
         tvCode.setText(data.getJobNo());
         tvClient.setText(data.getCustomerUserName());
         tvCompany.setText(data.getSalesCompanyName());
@@ -119,7 +120,6 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
         tvEndTime.setText(data.getPlanEndDate());
         tvCreatePerson.setText(data.getCreateUserName());
         tvTime.setText(data.getCreateDateTime());
-        tvTime.setText(data.getCreateDateTime());
         tvTakeOn.setText(data.getJobUserName());
     }
 
@@ -217,7 +217,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
                 startActivity(MesTicketLogActivity.class, "id", data.getJobNo());
                 break;
             case R.id.rl_add_log:
-                startActivity(MesTicketAddLogActivity.class, "id", data.getJobNo());
+                startActivity(MesTicketAddLogActivity.class, "data", JSON.toJSONString(data));
                 break;
         }
     }

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

@@ -58,7 +58,7 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
         dataAdapter = new MesTicketLogAdapter(R.layout.item_mes_ticket_log, dataList);
         dataAdapter.bindToRecyclerView(rvData);
         dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
-        param = WorkUtils.pageKey();
+        param = WorkUtils.simpleParam();
         param.put("jobNo", getIntent().getStringExtra("id"));
         getData();
     }

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

@@ -99,6 +99,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"
@@ -121,6 +122,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"