1.接收卡主

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

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

@@ -94,4 +94,13 @@ public interface MesApiService {
      */
     @POST("/himes/api/msCustomerSales/show/page.json")
     Observable<BaseMesBean> clientList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+    /**
+     * 工作总结新增
+     *
+     * @return
+     */
+    @POST("/himes/api/msWorkOrder/accept.json?")
+    Observable<BaseMesBean> receiveTicket(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
 }

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

@@ -83,16 +83,30 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
     RelativeLayout rlAddLog;
     private AccountBean dataBean;
     private TicketBean.ListBean data;
+    private Map<String, Object> param;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
         String from = getIntent().getStringExtra("from");//0 服务 1 任务担当
+        rvClazz.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
         if (TextUtils.equals(from, "1")) {
             llBottom.setVisibility(View.VISIBLE);
+            if (data.getJobStatus() == 1) {
+                btnReceive.setVisibility(View.VISIBLE);
+            }
+            if (data.getJobStatus() == 1) {
+                btnReceive.setVisibility(View.VISIBLE);
+            }
+            if (data.getJobStatus() == 2) {
+                btnReceive.setVisibility(View.VISIBLE);
+                rlLog.setVisibility(View.GONE);
+                rlAddLog.setVisibility(View.VISIBLE);
+            }
+        } else {
+            rlAddLog.setVisibility(View.GONE);
         }
-        rvClazz.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
-        data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
         tvCode.setText(data.getJobNo());
         tvClient.setText(data.getCustomerUserName());
         tvCompany.setText(data.getSalesCompanyName());
@@ -141,7 +155,13 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
     @Override
     protected void initData() {
         getType(data.getJobTypeId());
-        getData();
+        param = WorkUtils.simpleParam();
+        param.put("jobStatus", 1);
+        param.put("jobNo", data.getJobNo());
+        param.put("acceptUserId", 1);
+        param.put("acceptUserName", 1);
+        param.put("jobUserId", 1);
+//        getData();
     }
 
     private void getData() {
@@ -188,6 +208,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.btn_receive:
+                receive();
                 break;
             case R.id.btn_submit:
                 startActivity(MesTicketAddSummaryActivity.class, "id", data.getJobNo());
@@ -200,4 +221,29 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
                 break;
         }
     }
+
+    private void receive() {
+        RtfUtils.getMesRtf().receiveTicket("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;
+                }
+                toast("接收成功");
+            }
+        });
+
+    }
 }

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

@@ -186,6 +186,12 @@ public class MesTicketListActivity extends WorkToolBarActivity {
                         startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));
                         break;
                     case 2:
+                        startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));
+                        break;
+                    case 3:
+                        startActivity(MesTicketDetailReviewActivity.class, "data", JSON.toJSONString(dataList.get(position)));
+                        break;
+                    case 4:
                         startActivity(MesTicketDetailFinishActivity.class, "data", JSON.toJSONString(dataList.get(position)));
                         break;
                 }

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

@@ -175,7 +175,13 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
                         startActivity(MesTicketDetailActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
                         break;
                     case 2:
-                        startActivity(MesTicketDetailFinishActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
+                        startActivity(MesTicketDetailActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
+                        break;
+                    case 3:
+                        startActivity(MesTicketDetailReviewActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
+                        break;
+                    case 4:
+                        startActivity(MesTicketDetailReviewActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
                         break;
                 }
             }

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

@@ -23,12 +23,14 @@
             android:background="@drawable/shape_blue_circle"
             android:paddingHorizontal="40mm"
             android:text="接收"
+            android:visibility="gone"
             android:textColor="@color/white" />
 
         <Button
             android:id="@+id/btn_submit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:background="@drawable/shape_blue_circle"
             android:paddingHorizontal="40mm"
             android:text="提交工单总结"
@@ -401,7 +403,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"