1.质量反馈流程

2.//TODO 设备三个子菜单,坩埚下单，mes其他页面，质量反馈字段修改，mes新菜单，mes用户反馈空也展示，编辑任务担当无法修改.支数参数

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

@@ -161,10 +161,19 @@ public class FeedbackDetailBean {
     private String createUserName;
     private String updateUserId;
     private String updateUserName;
+    private String procId;
     private AttachmentVOBean attachmentVO;
     private Object defectMudIds;
     private boolean delete;
 
+    public String getProcId() {
+        return procId;
+    }
+
+    public void setProcId(String procId) {
+        this.procId = procId;
+    }
+
     public String getId() {
         return id;
     }

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

+package com.wd.workoffice.bean.mesBean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MenuBean {
+
+    /**
+     * text : 基础数据
+     * tags : [null]
+     * id : 04d20aa0b40811e99593fa163e1166bd
+     * parentId : null
+     * levelCode : 000001
+     * nodes : [{"text":"工序管理","tags":["/processManagement"],"id":"6e588cadb40811e99593fa163e1166bd","parentId":"04d20aa0b40811e99593fa163e1166bd","levelCode":"gx000001","nodes":null,"icon":null,"url":null,"description":"1","appIcon":null},{"text":"工厂日历","tags":["/factoryCalendar"],"id":"a5b730b0b40811e99593fa163e1166bd","parentId":"04d20aa0b40811e99593fa163e1166bd","levelCode":"gx000002","nodes":null,"icon":null,"url":null,"description":"1","appIcon":null},{"text":"产品系列","tags":["/productLine"],"id":"31e71628bfe811e99593fa163e1166bd","parentId":"04d20aa0b40811e99593fa163e1166bd","levelCode":"gx000003","nodes":null,"icon":null,"url":null,"description":"1","appIcon":null},{"text":"产品数据","tags":["/productData"],"id":"e67c868db40811e99593fa163e1166bd","parentId":"04d20aa0b40811e99593fa163e1166bd","levelCode":"gx000004","nodes":null,"icon":null,"url":null,"description":"1","appIcon":null},{"text":"仓库目录","tags":["/wuliuguanli/cangku"],"id":"eabd565d67ef11ea8334fa163e1166bd","parentId":"04d20aa0b40811e99593fa163e1166bd","levelCode":"gx000005","nodes":null,"icon":null,"url":null,"description":"1","appIcon":null},{"text":"物料类别","tags":["/wuliuguanli/wuliaoleibie"],"id":"06c294c667f111ea8334fa163e1166bd","parentId":"04d20aa0b40811e99593fa163e1166bd","levelCode":"gx000006","nodes":null,"icon":null,"url":null,"description":"1","appIcon":null},{"text":"货品资料","tags":["/wuliuguanli/wuliaoqingdan"],"id":"123a9a8d67f111ea8334fa163e1166bd","parentId":"04d20aa0b40811e99593fa163e1166bd","levelCode":"gx000007","nodes":null,"icon":null,"url":null,"description":"1","appIcon":null}]
+     * icon : iconfont iconjichushujuguanli
+     * url : null
+     * description : 0
+     * appIcon : null
+     */
+
+    private String text;
+    private String id;
+    private Object parentId;
+    private String levelCode;
+    private String icon;
+    private Object url;
+    private String description;
+    private Object appIcon;
+    private List<NodesBean> nodes;
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Object getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Object parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getLevelCode() {
+        return levelCode;
+    }
+
+    public void setLevelCode(String levelCode) {
+        this.levelCode = levelCode;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public Object getUrl() {
+        return url;
+    }
+
+    public void setUrl(Object url) {
+        this.url = url;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Object getAppIcon() {
+        return appIcon;
+    }
+
+    public void setAppIcon(Object appIcon) {
+        this.appIcon = appIcon;
+    }
+
+
+    public List<NodesBean> getNodes() {
+        return nodes;
+    }
+
+    public void setNodes(List<NodesBean> nodes) {
+        this.nodes = nodes;
+    }
+
+    public static class NodesBean {
+        /**
+         * text : 工序管理
+         * tags : ["/processManagement"]
+         * id : 6e588cadb40811e99593fa163e1166bd
+         * parentId : 04d20aa0b40811e99593fa163e1166bd
+         * levelCode : gx000001
+         * nodes : null
+         * icon : null
+         * url : null
+         * description : 1
+         * appIcon : null
+         */
+
+        private String text;
+        private String id;
+        private String parentId;
+        private String levelCode;
+        private Object nodes;
+        private Object icon;
+        private Object url;
+        private String description;
+        private Object appIcon;
+        private List<String> tags;
+
+        public String getText() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getParentId() {
+            return parentId;
+        }
+
+        public void setParentId(String parentId) {
+            this.parentId = parentId;
+        }
+
+        public String getLevelCode() {
+            return levelCode;
+        }
+
+        public void setLevelCode(String levelCode) {
+            this.levelCode = levelCode;
+        }
+
+        public Object getNodes() {
+            return nodes;
+        }
+
+        public void setNodes(Object nodes) {
+            this.nodes = nodes;
+        }
+
+        public Object getIcon() {
+            return icon;
+        }
+
+        public void setIcon(Object icon) {
+            this.icon = icon;
+        }
+
+        public Object getUrl() {
+            return url;
+        }
+
+        public void setUrl(Object url) {
+            this.url = url;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public Object getAppIcon() {
+            return appIcon;
+        }
+
+        public void setAppIcon(Object appIcon) {
+            this.appIcon = appIcon;
+        }
+
+        public List<String> getTags() {
+            return tags;
+        }
+
+        public void setTags(List<String> tags) {
+            this.tags = tags;
+        }
+    }
+}

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

@@ -131,7 +131,7 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/msSceneFeedback/createByWorkOrder.json")
-    Observable<BaseMesBean> userClientList(@Query("functionId") String functionId,@Body RequestBody requestBody);
+    Observable<BaseMesBean> userClientList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
 
     /**
@@ -258,7 +258,6 @@ public interface MesApiService {
     Observable<BaseMesBean> speedAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
 
-
     /**
      * otherSupplierAdd
      *
@@ -277,8 +276,6 @@ public interface MesApiService {
 
 
     /**
-     *
-     *
      * @return
      */
     @POST("/himes/api/msSceneFeedback/show/getByFeedInfo.json")
@@ -365,6 +362,13 @@ public interface MesApiService {
      */
     @GET("/himes/api/feedback/show/{id}.json")
     Observable<BaseMesBean> feedbackDetail(@Path("id") String id, @Query("functionId") String functionId);
+    /**
+     * 质量反馈 详情
+     *
+     * @return
+     */
+    @POST("/himes/api/feedback/approved.json")
+    Observable<BaseMesBean> feedbackApproved(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
      * 质量反馈 详情
@@ -374,6 +378,14 @@ public interface MesApiService {
     @POST("/himes/api/feedback/deal/update.json")
     Observable<BaseMesBean> feedbackCheck(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+    /**
+     * 质量反馈 详情
+     *
+     * @return
+     */
+    @POST("/himes/api/main/getRoleFunction.json")
+    Observable<BaseMesBean> feedbackMenu();
+
     /**
      * 销售经理查询
      *
@@ -406,6 +418,7 @@ public interface MesApiService {
      */
     @POST("/himes/api/defectdict/show/page.json")
     Observable<BaseMesBean> defectList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
      * 客户
      *
@@ -419,12 +432,19 @@ public interface MesApiService {
      */
     @POST("/himes/api/feedback/add/save.json")
     Observable<BaseMesBean> feedbackAdd(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
      * @return
      */
     @POST("/himes/api/feedback/update/save.json")
     Observable<BaseMesBean> feedbackUpdate(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+    /**
+     * @return
+     */
+    @POST("/himes/api/feedback/sendActivity.json")
+    Observable<BaseMesBean> startFeedback(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
      * @return
      */

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityActivity.java

@@ -74,6 +74,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
         param = WorkUtils.pageMesKey();
         param.put("pageNum", page);
         getData();
+        WorkUtils.getMesMenu();
     }
 
     private void getData() {

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAddActivity.java

 package com.wd.workoffice.ui.activity.mes.quality;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.EditText;
+import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 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.event.CheckFeedbackEvent;
@@ -19,11 +20,7 @@ import com.wd.workoffice.bean.mesBean.BoxBean;
 import com.wd.workoffice.bean.mesBean.ChooseMachineBean;
 import com.wd.workoffice.bean.mesBean.DefectBean;
 import com.wd.workoffice.bean.mesBean.FeedbackBean;
-import com.wd.workoffice.bean.mesBean.JobTypeBean;
 import com.wd.workoffice.bean.mesBean.MesClientBean;
-import com.wd.workoffice.bean.mesBean.TakeOnBean;
-import com.wd.workoffice.bean.mesBean.TicketBean;
-import com.wd.workoffice.bean.workEnum.OrderType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketClientActivity;
@@ -84,6 +81,14 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
     RelativeLayout rlDefect;
     @BindView(R.id.et_desc)
     TextView etDesc;
+    @BindView(R.id.btn_add)
+    Button btnAdd;
+    @BindView(R.id.btn_submit)
+    Button btnSubmit;
+    @BindView(R.id.ll_bottom)
+    LinearLayout llBottom;
+    @BindView(R.id.rl_machine)
+    RelativeLayout rlMachine;
     private MesClientBean.ListBean chooseClient;
     private ChooseMachineBean chooseMachine;
     private Map<String, Object> param;
@@ -102,6 +107,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
         String data = getIntent().getStringExtra("data");
         if (!TextUtils.isEmpty(data)) {
             FeedbackBean.ListBean ticketBean = JSON.parseObject(data, FeedbackBean.ListBean.class);
+            param.put("id",ticketBean.getId());
             chooseClient = new MesClientBean.ListBean();
             chooseClient.setCustomerCode(ticketBean.getCustomerId());
             chooseClient.setCustomerName(ticketBean.getCustomerName());
@@ -161,6 +167,11 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
             param.put("defectCode", chooseDefect.getDefectCode());
             param.put("defectName", chooseDefect.getDefectName());
         }
+        if (TextUtils.isEmpty(getIntent().getStringExtra("data"))) {
+            btnAdd.setVisibility(View.VISIBLE);
+        } else {
+            btnSubmit.setVisibility(View.VISIBLE);
+        }
     }
 
 
@@ -174,9 +185,32 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick({R.id.rl_machine, R.id.rl_client, R.id.rl_box, R.id.rl_defect})
+    @OnClick({R.id.btn_add, R.id.btn_submit,R.id.rl_machine, R.id.rl_client, R.id.rl_box, R.id.rl_defect})
     public void onViewClicked(View view) {
         switch (view.getId()) {
+            case R.id.btn_add:
+                submit();
+                break;
+            case R.id.btn_submit:
+                if (chooseClient == null) {
+                    toast("请先选择客户");
+                    break;
+                }
+                if (chooseMachine == null) {
+                    toast("请先选择连铸机");
+                    break;
+                }
+                if (chooseBox == null) {
+                    toast("请先选择箱号");
+                    break;
+                }
+                if (chooseDefect == null) {
+                    toast("请先选择缺陷");
+                    break;
+                }
+//                param.put("", "");
+                submit();
+                break;
             case R.id.rl_client:
                 startActivityForResult(MesTicketClientActivity.class,
                         10001);
@@ -279,7 +313,6 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
                     toast("请先选择缺陷");
                     break;
                 }
-//                param.put("", "");
                 submit();
                 break;
             case R.id.save:
@@ -290,14 +323,12 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
     }
 
     private void submit() {
-
         Observable<BaseMesBean> observable;
         if (TextUtils.isEmpty(getIntent().getStringExtra("data"))) {
-            param.put("status", "2");
+            param.put("status", "1");
             observable = RtfUtils.getMesRtf().feedbackAdd("1", WorkUtils.convertMapToBody(param));
         } else {
-            param.put("status", "1");
-            observable = RtfUtils.getMesRtf().feedbackUpdate("1", WorkUtils.convertMapToBody(param));
+            observable = RtfUtils.getMesRtf().startFeedback("6628708f85d111ea8334fa163e1166bd", WorkUtils.convertMapToBody(param));
         }
         observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityClientActivity.java

@@ -16,6 +16,8 @@ import com.wd.workoffice.bean.mesBean.FeedbackDetailBean;
 import com.wd.workoffice.bean.mesBean.ManagerUserBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.util.DataKeeper;
+import com.wd.workoffice.util.UserKeeper;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -59,7 +61,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
         param = WorkUtils.simpleParam();
         FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
         param.put("id",data.getId());
-        param.put("status",4);
+        param.put("procId",data.getProcId());
     }
 
     private void submit() {
@@ -67,7 +69,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
         param.put("customerResponse",tvClientReply.getText().toString());
         param.put("relatedRecord",tvClientRecord.getText().toString());
 
-        RtfUtils.getMesRtf().feedbackCheck("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), 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/quality/MesQualityDetailActivity.java

 package com.wd.workoffice.ui.activity.mes.quality;
 
+import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
@@ -15,12 +16,14 @@ import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.ImgAdapter;
+import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -109,9 +112,12 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
     TextView tvClientPerson;
     @BindView(R.id.ll_client)
     LinearLayout llClient;
+    @BindView(R.id.btn_refuse)
+    Button btnRefuse;
     private FeedbackDetailBean detailBean;
     private List<ImageBean> imgList;
     private ImgAdapter imgAdapter;
+
     @Override
     protected void initView() {
         ButterKnife.bind(this);
@@ -159,12 +165,20 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
         imgList.addAll(detailBean.getAttachments());
         imgAdapter.notifyDataSetChanged();
         switch (detailBean.getStatus()) {
+//            case "1":
+//                llClient.setVisibility(View.GONE);
+//                llCompany.setVisibility(View.GONE);
+//                llManager.setVisibility(View.GONE);
+//                llBottom.setVisibility(View.VISIBLE);
+//                btnSubmit.setVisibility(View.VISIBLE);
+//                break;
             case "2":
                 llClient.setVisibility(View.GONE);
                 llCompany.setVisibility(View.GONE);
                 llManager.setVisibility(View.GONE);
                 llBottom.setVisibility(View.VISIBLE);
                 btnReviews.setVisibility(View.VISIBLE);
+                btnRefuse.setVisibility(View.VISIBLE);
                 break;
             case "3":
                 llClient.setVisibility(View.GONE);
@@ -177,6 +191,8 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
                 llCompany.setVisibility(View.GONE);
                 llManager.setVisibility(View.GONE);
                 llBottom.setVisibility(View.VISIBLE);
+                btnReviews.setVisibility(View.VISIBLE);
+                btnRefuse.setVisibility(View.GONE);
                 break;
             case "5":
                 llClient.setVisibility(View.GONE);
@@ -242,24 +258,7 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick(R.id.btn_reviews)
-    public void onViewClicked() {
-        switch (detailBean.getStatus()) {
-            //1 待提交、2 待审批、3 已驳回、4 待质量部分析、 5 待相关部门反馈、6 待关闭、7 已关闭
-            case "1":
-                startActivity(MesQualityManagerActivity.class,"data",JSON.toJSONString(detailBean));
-                break;
-            case "4":
-                startActivity(MesQualityFactoryActivity.class,"data",JSON.toJSONString(detailBean));
-                break;
-            case "5":
-                startActivity(MesQualityFactoryActivity.class,"data",JSON.toJSONString(detailBean));
-                break;
-            case "6":
-                startActivity(MesQualityClientActivity.class,"data",JSON.toJSONString(detailBean));
-                break;
-        }
-    }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -274,6 +273,65 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
 
     @Subscribe
     public void refresh(CheckFeedbackEvent event) {
-      finish();
+        finish();
+    }
+
+
+
+    @OnClick({R.id.btn_refuse, R.id.btn_reviews})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.btn_refuse:
+                check(1);
+                break;
+            case R.id.btn_reviews:
+                switch (detailBean.getStatus()) {
+                    //1 待提交、2 待审批、3 已驳回、4 待质量部分析、 5 待相关部门反馈、6 待关闭、7 已关闭
+                    case "2":
+                        check(0);
+                        break;
+                    case "4":
+                        startActivity(MesQualityManagerActivity.class, "data", JSON.toJSONString(detailBean));
+                        break;
+                    case "5":
+                        startActivity(MesQualityFactoryActivity.class, "data", JSON.toJSONString(detailBean));
+                        break;
+                    case "6":
+                        startActivity(MesQualityClientActivity.class, "data", JSON.toJSONString(detailBean));
+                        break;
+                }
+                break;
+        }
+
+    }
+
+
+    private void check(int status) {// 0 同意 1 拒绝
+        Map<String, Object> param = WorkUtils.simpleParam();
+        param.put("approved",status);
+        param.put("id",detailBean.getId());
+        param.put("procId",detailBean.getProcId());
+        RtfUtils.getMesRtf().feedbackApproved( "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("提交成功 ");
+                detail();
+            }
+        });
     }
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityFactoryActivity.java

@@ -20,7 +20,9 @@ import com.wd.workoffice.bean.mesBean.MesProcessBean;
 import com.wd.workoffice.bean.mesBean.QuestionBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.util.DataKeeper;
 import com.wd.workoffice.util.PickTimeUtils;
+import com.wd.workoffice.util.UserKeeper;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -43,8 +45,6 @@ import io.reactivex.disposables.Disposable;
  * github: https://github.com/FlexibleXd
  **/
 public class MesQualityFactoryActivity extends WorkToolBarActivity {
-
-
     @BindView(R.id.tv_factory_reason)
     EditText tvFactoryReason;
     @BindView(R.id.tv_factory_suggest)
@@ -85,7 +85,8 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
         param = WorkUtils.simpleParam();
         data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
         param.put("id", data.getId());
-        param.put("status",3);
+        param.put("procId", data.getProcId());
+//        param.put("status",3);
     }
 
     private void submit() {
@@ -97,7 +98,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
         param.put("factoryAnalysis",tvFactoryReason.getText().toString());
         param.put("factoryImplement",tvFactoryStatus.getText().toString());
         param.put("factoryLeaderOpinion",tvFactorySuggest.getText().toString());
-        RtfUtils.getMesRtf().feedbackCheck("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), 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/quality/MesQualityManagerActivity.java

@@ -21,6 +21,7 @@ import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.ImgAddAdapter;
+import com.wd.workoffice.util.DataKeeper;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.WorkUtils;
 import com.zhihu.matisse.Matisse;
@@ -77,7 +78,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
         param = WorkUtils.simpleParam();
         FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
         param.put("id",data.getId());
-        param.put("status",2);
+        param.put("procId",data.getProcId());
         imgList=new ArrayList<>();
         ImageBean imageBean = new ImageBean();
         imageBean.setUri(null);
@@ -95,7 +96,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
             uploadImg.add(imgList.get(i));
         }
         param.put("attachments",uploadImg);
-        RtfUtils.getMesRtf().feedbackCheck("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), 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/user/UserSettingActivity.java

@@ -19,6 +19,7 @@ import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.MainActivity;
 import com.wd.workoffice.ui.activity.MainLoginActivity;
 import com.wd.workoffice.ui.activity.login.LoginActivity;
+import com.wd.workoffice.util.DataKeeper;
 import com.wd.workoffice.util.UserKeeper;
 
 import org.greenrobot.eventbus.EventBus;
@@ -99,6 +100,7 @@ public class UserSettingActivity extends WorkToolBarActivity {
         Intent intent = new Intent(UserSettingActivity.this, MainLoginActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
         UserKeeper.getInstance().clearAll();
+        DataKeeper.getInstance().clearAll();
         EventBus.getDefault().post(new LoginEvent());
         startActivity(intent);
 //        RtfUtils.getRtf().logout().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {

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

+package com.wd.workoffice.util;
+
+
+import android.text.TextUtils;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.bean.TokenBean;
+import com.wd.workoffice.bean.UserInfoBean;
+
+import java.util.List;
+
+import flexible.xd.android_base.utils.SPUtils;
+
+/**
+ * Created by Flexible on 2017/1/9 0009.
+ */
+
+public class DataKeeper {
+    private volatile static DataKeeper keeper;
+    private SPUtils sp = SPUtils.getInstance("DataKeeper");
+    private final String MES_MENU_ID = "MES_MENU_ID";
+
+    private DataKeeper() {
+    }
+
+    public static DataKeeper getInstance() {
+        if (keeper == null) {
+            synchronized (DataKeeper.class) {
+                if (keeper == null) {
+                    keeper = new DataKeeper();
+                }
+            }
+        }
+        return keeper;
+    }
+    /**
+     * mes菜单id
+     *
+     * @param info
+     */
+    public void keepMenuId(String info) {
+        sp.put(MES_MENU_ID, info);
+    }
+
+    public String getMenuId() {
+        return sp.getString(MES_MENU_ID);
+    }
+
+    public void clearMenuId() {
+        sp.put(MES_MENU_ID, false);
+    }
+
+    public void clearAll() {
+        clearMenuId();
+    }
+}

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

@@ -16,14 +16,18 @@ import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.load.ImageHeaderParser;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.Config;
 import com.wd.workoffice.app.WorkApp;
+import com.wd.workoffice.bean.event.CheckFeedbackEvent;
 import com.wd.workoffice.bean.event.RefreshTokenEvent;
+import com.wd.workoffice.bean.mesBean.MenuBean;
 import com.wd.workoffice.bean.workEnum.OrderType;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.bean.workEnum.PermissionType;
 import com.wd.workoffice.retrofit.ApiService;
 import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.StarAdapter;
 
 import org.greenrobot.eventbus.EventBus;
@@ -39,6 +43,8 @@ import java.util.Map;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import flexible.xd.android_base.network.rtfhttp.RtfHelper;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import retrofit2.Call;
@@ -436,6 +442,41 @@ public class WorkUtils {
         });
     }
 
+    /**
+     * 刷新token
+     *
+     * @return
+     */
+    public static void getMesMenu() {
+        RtfUtils.getMesRtf().feedbackMenu().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                if (!data.isSuccess()) {
+                    return;
+                }
+                List<MenuBean> menuList = JSON.parseArray(data.getData().toString(), MenuBean.class);
+                for (MenuBean menuBean : menuList) {
+                    if (TextUtils.equals("市场服务",menuBean.getText())){
+                        for (MenuBean.NodesBean node : menuBean.getNodes()) {
+                            if (TextUtils.equals("质量反馈",node.getText())){
+                                DataKeeper.getInstance().keepMenuId(node.getId());
+                            }
+                        }
+                    }
+                }
+
+            }
+        });
+    }
+
     /**
      * 判断是否拥有权限
      *

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

 <?xml version="1.0" encoding="utf-8"?>
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -20,8 +19,8 @@
             android:background="@drawable/shape_red_circle"
             android:paddingHorizontal="40mm"
             android:text="驳回"
-            android:visibility="gone"
-            android:textColor="@color/white" />
+            android:textColor="@color/white"
+            android:visibility="gone" />
 
         <Button
             android:id="@+id/btn_reviews"
@@ -32,6 +31,7 @@
             android:paddingHorizontal="40mm"
             android:text="通过"
             android:textColor="@color/white" />
+
     </LinearLayout>
 
     <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -39,7 +39,8 @@
         android:layout_height="match_parent"
         android:layout_above="@id/ll_bottom">
 
-        <LinearLayout   android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white"
             android:orientation="vertical">
@@ -695,11 +696,11 @@
                 <View style="@style/dividerX" />
 
                 <RelativeLayout
-                    android:visibility="gone"
                     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"
@@ -722,11 +723,11 @@
                 <View style="@style/dividerX" />
 
                 <RelativeLayout
-                    android:visibility="gone"
                     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"