1.修改实际员工和物料

2.TODO 单独菜单

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

@@ -717,6 +717,14 @@ public interface MesApiService {
     @POST("/himes/api/workOrder/show/pagePlanLabor.json")
     Observable<BaseMesBean> pagePlanLabor(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+    /**
+     * 质量工单-计划-人员
+     *
+     * @return
+     */
+    @POST("/himes/api/workOrder/show/pageLabor.json")
+    Observable<BaseMesBean> pageLabor(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
      * 质量工单-计划-物料
      *
@@ -724,6 +732,13 @@ public interface MesApiService {
      */
     @POST("/himes/api/workOrder/show/pagePlanMaterial.json")
     Observable<BaseMesBean> pagePlanMaterial(@Query("functionId") String functionId, @Body RequestBody requestBody);
+    /**
+     * 质量工单-计划-物料
+     *
+     * @return
+     */
+    @POST("/himes/api/workOrder/show/pageMaterial.json")
+    Observable<BaseMesBean> pageMaterial(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
 
     /**

app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkPlanFragment.java

@@ -199,11 +199,11 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
             taskParam.put("pageNum", taskPage);
             getTask();
         }, rvData);
-        //TODO 子工单任务详情跳转
         taskAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(WorkTaskDetailActivity.class,"info",JSON.toJSONString(taskList.get(position)));
+                startActivity(WorkTaskDetailActivity.class,
+                        "plan","1","info",JSON.toJSONString(taskList.get(position)));
             }
         });
     }

app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkTrueFragment.java

 package com.wd.workoffice.ui.activity.mes.work;
 
 import android.os.Bundle;
+import android.view.View;
 import android.widget.TextView;
 
 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.WorkBaseFg;
@@ -196,7 +198,13 @@ public class QualityWorkTrueFragment extends WorkBaseFg {
             taskParam.put("pageNum", taskPage);
             getTask();
         }, rvData);
-        //TODO 子工单任务详情跳转
+        taskAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(WorkTaskDetailActivity.class,
+                        "plan","0","info",JSON.toJSONString(taskList.get(position)));
+            }
+        });
     }
 
 

app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkTaskDetailActivity.java

@@ -42,9 +42,10 @@ public class WorkTaskDetailActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
-        String status = getIntent().getStringExtra("status");
+        String plan = getIntent().getStringExtra("plan");
         Bundle bundle = new Bundle();
         bundle.putString("info", getIntent().getStringExtra("info"));
+        bundle.putString("plan", plan);
         FragmentManager sfm = getSupportFragmentManager();
         List<Fragment> data = new ArrayList<>();
         WorkTaskPeopleFragment qualityWorkFragment = new WorkTaskPeopleFragment();

app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkTaskMaterialsFragment.java

 package com.wd.workoffice.ui.activity.mes.work;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -26,6 +27,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -48,6 +50,7 @@ public class WorkTaskMaterialsFragment extends WorkBaseFg {
     private Map<String, Object> paramMap;
     private Map<String, Object> taskParam;
     private Map<String, Object> taskParamMap;
+    private String plan;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -55,6 +58,7 @@ public class WorkTaskMaterialsFragment extends WorkBaseFg {
         Bundle arguments = getArguments();
         if (arguments != null) {
             info = JSON.parseObject(arguments.getString("info"), WorkTaskBean.ListBean.class);
+            plan = arguments.getString("plan");
         }
     }
 
@@ -83,7 +87,11 @@ public class WorkTaskMaterialsFragment extends WorkBaseFg {
 
 
     private void getTask() {
-        RtfUtils.getMesRtf().pagePlanMaterial("1", WorkUtils.convertMapToBody(taskParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        Observable<BaseMesBean> baseMesBeanObservable =
+                TextUtils.equals("1",plan)?
+                        RtfUtils.getMesRtf().pagePlanMaterial("1", WorkUtils.convertMapToBody(taskParam))
+        :RtfUtils.getMesRtf().pageMaterial("1", WorkUtils.convertMapToBody(taskParam));
+        baseMesBeanObservable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkTaskPeopleFragment.java

 package com.wd.workoffice.ui.activity.mes.work;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -29,6 +30,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -51,6 +53,7 @@ public class WorkTaskPeopleFragment extends WorkBaseFg {
     private Map<String, Object> paramMap;
     private Map<String, Object> taskParam;
     private Map<String, Object> taskParamMap;
+    private String plan;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -58,6 +61,7 @@ public class WorkTaskPeopleFragment extends WorkBaseFg {
         Bundle arguments = getArguments();
         if (arguments != null) {
             info = JSON.parseObject(arguments.getString("info"), WorkTaskBean.ListBean.class);
+            plan = arguments.getString("plan");
         }
     }
 
@@ -86,7 +90,11 @@ public class WorkTaskPeopleFragment extends WorkBaseFg {
 
 
     private void getTask() {
-        RtfUtils.getMesRtf().pagePlanLabor("1", WorkUtils.convertMapToBody(taskParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        Observable<BaseMesBean> baseMesBeanObservable =
+                TextUtils.equals("1",plan)?
+                        RtfUtils.getMesRtf().pagePlanLabor("1", WorkUtils.convertMapToBody(taskParam))
+                        :RtfUtils.getMesRtf().pageLabor("1", WorkUtils.convertMapToBody(taskParam));
+        baseMesBeanObservable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }