1.详情数据初步展示

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改,用户反馈 新增没通

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

+package com.wd.workoffice.bean.mesBean;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class UserDataDetailBean {
+
+        /**
+         * id : null
+         * createDateTime : null
+         * updateDateTime : null
+         * mainInfo : {"id":"31","isDelete":null,"createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20040100099","customerUserCode":"cust2","customerUserName":"客户2","salesCompanyCode":"company2","salesCompanyName":"公司2","salesManagerCode":"manager3","salesManagerName":"经理3","steelmakingInfoCode":"STEEL20040100099","feedbackDateTime":null,"createUserId":"","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":false,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":1586253261000,"approvalStatus":2,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":null,"steelmakingWorksName":null,"annualOutput":null,"steelGrade":null,"continuousCasterName":null,"continuousCasterType":null,"delete":null}
+         * steelInfo : {"id":"21","createDateTime":null,"updateDateTime":null,"steelmakingInfoCode":"STEEL20040100099","steelmakingWorksCode":"lgc2","steelmakingFurnaceCode":"lgl2","refiningFurnaceCode":"jlu2","ladleCode":"gb2","continuousCasterCode":"lzj222","createUserId":"","createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":false}
+         * steelWorks : null
+         * steelFurnList : null
+         * steelRefFurnList : null
+         * steelLadleList : null
+         * castInfo : null
+         * castLadle : null
+         * covAgent : null
+         * mouldFlu : null
+         * productList : null
+         * supplyList : null
+         * stockList : null
+         * otherSupList : null
+         * otherLadleList : null
+         * settleList : null
+         * delete : null
+         */
+
+        private Object id;
+        private Object createDateTime;
+        private Object updateDateTime;
+        private MainInfoBean mainInfo;
+        private SteelInfoBean steelInfo;
+        private Object steelWorks;
+        private Object steelFurnList;
+        private Object steelRefFurnList;
+        private Object steelLadleList;
+        private Object castInfo;
+        private Object castLadle;
+        private Object covAgent;
+        private Object mouldFlu;
+        private Object productList;
+        private Object supplyList;
+        private Object stockList;
+        private Object otherSupList;
+        private Object otherLadleList;
+        private Object settleList;
+        private Object delete;
+
+        public Object getId() {
+            return id;
+        }
+
+        public void setId(Object id) {
+            this.id = id;
+        }
+
+        public Object getCreateDateTime() {
+            return createDateTime;
+        }
+
+        public void setCreateDateTime(Object createDateTime) {
+            this.createDateTime = createDateTime;
+        }
+
+        public Object getUpdateDateTime() {
+            return updateDateTime;
+        }
+
+        public void setUpdateDateTime(Object updateDateTime) {
+            this.updateDateTime = updateDateTime;
+        }
+
+        public MainInfoBean getMainInfo() {
+            return mainInfo;
+        }
+
+        public void setMainInfo(MainInfoBean mainInfo) {
+            this.mainInfo = mainInfo;
+        }
+
+        public SteelInfoBean getSteelInfo() {
+            return steelInfo;
+        }
+
+        public void setSteelInfo(SteelInfoBean steelInfo) {
+            this.steelInfo = steelInfo;
+        }
+
+        public Object getSteelWorks() {
+            return steelWorks;
+        }
+
+        public void setSteelWorks(Object steelWorks) {
+            this.steelWorks = steelWorks;
+        }
+
+        public Object getSteelFurnList() {
+            return steelFurnList;
+        }
+
+        public void setSteelFurnList(Object steelFurnList) {
+            this.steelFurnList = steelFurnList;
+        }
+
+        public Object getSteelRefFurnList() {
+            return steelRefFurnList;
+        }
+
+        public void setSteelRefFurnList(Object steelRefFurnList) {
+            this.steelRefFurnList = steelRefFurnList;
+        }
+
+        public Object getSteelLadleList() {
+            return steelLadleList;
+        }
+
+        public void setSteelLadleList(Object steelLadleList) {
+            this.steelLadleList = steelLadleList;
+        }
+
+        public Object getCastInfo() {
+            return castInfo;
+        }
+
+        public void setCastInfo(Object castInfo) {
+            this.castInfo = castInfo;
+        }
+
+        public Object getCastLadle() {
+            return castLadle;
+        }
+
+        public void setCastLadle(Object castLadle) {
+            this.castLadle = castLadle;
+        }
+
+        public Object getCovAgent() {
+            return covAgent;
+        }
+
+        public void setCovAgent(Object covAgent) {
+            this.covAgent = covAgent;
+        }
+
+        public Object getMouldFlu() {
+            return mouldFlu;
+        }
+
+        public void setMouldFlu(Object mouldFlu) {
+            this.mouldFlu = mouldFlu;
+        }
+
+        public Object getProductList() {
+            return productList;
+        }
+
+        public void setProductList(Object productList) {
+            this.productList = productList;
+        }
+
+        public Object getSupplyList() {
+            return supplyList;
+        }
+
+        public void setSupplyList(Object supplyList) {
+            this.supplyList = supplyList;
+        }
+
+        public Object getStockList() {
+            return stockList;
+        }
+
+        public void setStockList(Object stockList) {
+            this.stockList = stockList;
+        }
+
+        public Object getOtherSupList() {
+            return otherSupList;
+        }
+
+        public void setOtherSupList(Object otherSupList) {
+            this.otherSupList = otherSupList;
+        }
+
+        public Object getOtherLadleList() {
+            return otherLadleList;
+        }
+
+        public void setOtherLadleList(Object otherLadleList) {
+            this.otherLadleList = otherLadleList;
+        }
+
+        public Object getSettleList() {
+            return settleList;
+        }
+
+        public void setSettleList(Object settleList) {
+            this.settleList = settleList;
+        }
+
+        public Object getDelete() {
+            return delete;
+        }
+
+        public void setDelete(Object delete) {
+            this.delete = delete;
+        }
+
+        public static class MainInfoBean {
+            /**
+             * id : 31
+             * isDelete : null
+             * createDateTime : null
+             * updateDateTime : null
+             * feedbackInfoNo : FEED20040100099
+             * customerUserCode : cust2
+             * customerUserName : 客户2
+             * salesCompanyCode : company2
+             * salesCompanyName : 公司2
+             * salesManagerCode : manager3
+             * salesManagerName : 经理3
+             * steelmakingInfoCode : STEEL20040100099
+             * feedbackDateTime : null
+             * createUserId :
+             * createUserName : null
+             * updateUserId : 398c852b38e911ea8334fa163e1166bd
+             * updateUserName : hello
+             * isCustomerArchives : false
+             * approvalUserId : 398c852b38e911ea8334fa163e1166bd
+             * approvalUserName : hello
+             * approvalDateTime : 1586253261000
+             * approvalStatus : 2
+             * remark : null
+             * treeId : null
+             * treeName : null
+             * treeParentId : null
+             * steelmakingWorksCode : null
+             * steelmakingWorksName : null
+             * annualOutput : null
+             * steelGrade : null
+             * continuousCasterName : null
+             * continuousCasterType : null
+             * delete : null
+             */
+
+            private String id;
+            private Object isDelete;
+            private Object createDateTime;
+            private Object updateDateTime;
+            private String feedbackInfoNo;
+            private String customerUserCode;
+            private String customerUserName;
+            private String salesCompanyCode;
+            private String salesCompanyName;
+            private String salesManagerCode;
+            private String salesManagerName;
+            private String steelmakingInfoCode;
+            private Object feedbackDateTime;
+            private String createUserId;
+            private Object createUserName;
+            private String updateUserId;
+            private String updateUserName;
+            private boolean isCustomerArchives;
+            private String approvalUserId;
+            private String approvalUserName;
+            private long approvalDateTime;
+            private int approvalStatus;
+            private Object remark;
+            private Object treeId;
+            private Object treeName;
+            private Object treeParentId;
+            private Object steelmakingWorksCode;
+            private Object steelmakingWorksName;
+            private Object annualOutput;
+            private Object steelGrade;
+            private Object continuousCasterName;
+            private Object continuousCasterType;
+            private Object delete;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public Object getIsDelete() {
+                return isDelete;
+            }
+
+            public void setIsDelete(Object isDelete) {
+                this.isDelete = isDelete;
+            }
+
+            public Object getCreateDateTime() {
+                return createDateTime;
+            }
+
+            public void setCreateDateTime(Object createDateTime) {
+                this.createDateTime = createDateTime;
+            }
+
+            public Object getUpdateDateTime() {
+                return updateDateTime;
+            }
+
+            public void setUpdateDateTime(Object updateDateTime) {
+                this.updateDateTime = updateDateTime;
+            }
+
+            public String getFeedbackInfoNo() {
+                return feedbackInfoNo;
+            }
+
+            public void setFeedbackInfoNo(String feedbackInfoNo) {
+                this.feedbackInfoNo = feedbackInfoNo;
+            }
+
+            public String getCustomerUserCode() {
+                return customerUserCode;
+            }
+
+            public void setCustomerUserCode(String customerUserCode) {
+                this.customerUserCode = customerUserCode;
+            }
+
+            public String getCustomerUserName() {
+                return customerUserName;
+            }
+
+            public void setCustomerUserName(String customerUserName) {
+                this.customerUserName = customerUserName;
+            }
+
+            public String getSalesCompanyCode() {
+                return salesCompanyCode;
+            }
+
+            public void setSalesCompanyCode(String salesCompanyCode) {
+                this.salesCompanyCode = salesCompanyCode;
+            }
+
+            public String getSalesCompanyName() {
+                return salesCompanyName;
+            }
+
+            public void setSalesCompanyName(String salesCompanyName) {
+                this.salesCompanyName = salesCompanyName;
+            }
+
+            public String getSalesManagerCode() {
+                return salesManagerCode;
+            }
+
+            public void setSalesManagerCode(String salesManagerCode) {
+                this.salesManagerCode = salesManagerCode;
+            }
+
+            public String getSalesManagerName() {
+                return salesManagerName;
+            }
+
+            public void setSalesManagerName(String salesManagerName) {
+                this.salesManagerName = salesManagerName;
+            }
+
+            public String getSteelmakingInfoCode() {
+                return steelmakingInfoCode;
+            }
+
+            public void setSteelmakingInfoCode(String steelmakingInfoCode) {
+                this.steelmakingInfoCode = steelmakingInfoCode;
+            }
+
+            public Object getFeedbackDateTime() {
+                return feedbackDateTime;
+            }
+
+            public void setFeedbackDateTime(Object feedbackDateTime) {
+                this.feedbackDateTime = feedbackDateTime;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object 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 boolean isIsCustomerArchives() {
+                return isCustomerArchives;
+            }
+
+            public void setIsCustomerArchives(boolean isCustomerArchives) {
+                this.isCustomerArchives = isCustomerArchives;
+            }
+
+            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 long getApprovalDateTime() {
+                return approvalDateTime;
+            }
+
+            public void setApprovalDateTime(long approvalDateTime) {
+                this.approvalDateTime = approvalDateTime;
+            }
+
+            public int getApprovalStatus() {
+                return approvalStatus;
+            }
+
+            public void setApprovalStatus(int approvalStatus) {
+                this.approvalStatus = approvalStatus;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public Object getTreeId() {
+                return treeId;
+            }
+
+            public void setTreeId(Object treeId) {
+                this.treeId = treeId;
+            }
+
+            public Object getTreeName() {
+                return treeName;
+            }
+
+            public void setTreeName(Object treeName) {
+                this.treeName = treeName;
+            }
+
+            public Object getTreeParentId() {
+                return treeParentId;
+            }
+
+            public void setTreeParentId(Object treeParentId) {
+                this.treeParentId = treeParentId;
+            }
+
+            public Object getSteelmakingWorksCode() {
+                return steelmakingWorksCode;
+            }
+
+            public void setSteelmakingWorksCode(Object steelmakingWorksCode) {
+                this.steelmakingWorksCode = steelmakingWorksCode;
+            }
+
+            public Object getSteelmakingWorksName() {
+                return steelmakingWorksName;
+            }
+
+            public void setSteelmakingWorksName(Object steelmakingWorksName) {
+                this.steelmakingWorksName = steelmakingWorksName;
+            }
+
+            public Object getAnnualOutput() {
+                return annualOutput;
+            }
+
+            public void setAnnualOutput(Object annualOutput) {
+                this.annualOutput = annualOutput;
+            }
+
+            public Object getSteelGrade() {
+                return steelGrade;
+            }
+
+            public void setSteelGrade(Object steelGrade) {
+                this.steelGrade = steelGrade;
+            }
+
+            public Object getContinuousCasterName() {
+                return continuousCasterName;
+            }
+
+            public void setContinuousCasterName(Object continuousCasterName) {
+                this.continuousCasterName = continuousCasterName;
+            }
+
+            public Object getContinuousCasterType() {
+                return continuousCasterType;
+            }
+
+            public void setContinuousCasterType(Object continuousCasterType) {
+                this.continuousCasterType = continuousCasterType;
+            }
+
+            public Object getDelete() {
+                return delete;
+            }
+
+            public void setDelete(Object delete) {
+                this.delete = delete;
+            }
+        }
+
+        public static class SteelInfoBean {
+            /**
+             * id : 21
+             * createDateTime : null
+             * updateDateTime : null
+             * steelmakingInfoCode : STEEL20040100099
+             * steelmakingWorksCode : lgc2
+             * steelmakingFurnaceCode : lgl2
+             * refiningFurnaceCode : jlu2
+             * ladleCode : gb2
+             * continuousCasterCode : lzj222
+             * createUserId :
+             * createUserName : null
+             * updateUserId : null
+             * updateUserName : null
+             * remark : null
+             * delete : false
+             */
+
+            private String id;
+            private Object createDateTime;
+            private Object updateDateTime;
+            private String steelmakingInfoCode;
+            private String steelmakingWorksCode;
+            private String steelmakingFurnaceCode;
+            private String refiningFurnaceCode;
+            private String ladleCode;
+            private String continuousCasterCode;
+            private String createUserId;
+            private Object createUserName;
+            private Object updateUserId;
+            private Object updateUserName;
+            private Object remark;
+            private boolean delete;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public Object getCreateDateTime() {
+                return createDateTime;
+            }
+
+            public void setCreateDateTime(Object createDateTime) {
+                this.createDateTime = createDateTime;
+            }
+
+            public Object getUpdateDateTime() {
+                return updateDateTime;
+            }
+
+            public void setUpdateDateTime(Object updateDateTime) {
+                this.updateDateTime = updateDateTime;
+            }
+
+            public String getSteelmakingInfoCode() {
+                return steelmakingInfoCode;
+            }
+
+            public void setSteelmakingInfoCode(String steelmakingInfoCode) {
+                this.steelmakingInfoCode = steelmakingInfoCode;
+            }
+
+            public String getSteelmakingWorksCode() {
+                return steelmakingWorksCode;
+            }
+
+            public void setSteelmakingWorksCode(String steelmakingWorksCode) {
+                this.steelmakingWorksCode = steelmakingWorksCode;
+            }
+
+            public String getSteelmakingFurnaceCode() {
+                return steelmakingFurnaceCode;
+            }
+
+            public void setSteelmakingFurnaceCode(String steelmakingFurnaceCode) {
+                this.steelmakingFurnaceCode = steelmakingFurnaceCode;
+            }
+
+            public String getRefiningFurnaceCode() {
+                return refiningFurnaceCode;
+            }
+
+            public void setRefiningFurnaceCode(String refiningFurnaceCode) {
+                this.refiningFurnaceCode = refiningFurnaceCode;
+            }
+
+            public String getLadleCode() {
+                return ladleCode;
+            }
+
+            public void setLadleCode(String ladleCode) {
+                this.ladleCode = ladleCode;
+            }
+
+            public String getContinuousCasterCode() {
+                return continuousCasterCode;
+            }
+
+            public void setContinuousCasterCode(String continuousCasterCode) {
+                this.continuousCasterCode = continuousCasterCode;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public Object getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(Object updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public Object getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(Object updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public boolean isDelete() {
+                return delete;
+            }
+
+            public void setDelete(boolean delete) {
+                this.delete = delete;
+            }
+        }
+}

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

@@ -227,5 +227,13 @@ public interface MesApiService {
     @POST("/himes/api/msSceneFeedback/save.json")
     Observable<BaseMesBean> userDataAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
 
+    /**
+     * otherSupplierAdd
+     *
+     * @return
+     */
+    @POST("/himes/api/msSceneFeedback/show/getByFeedInfo.json")
+    Observable<BaseMesBean> userDataDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
 
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java

@@ -357,15 +357,16 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
 
     private void submit() {
         Map<String, Object> param = WorkUtils.simpleParam();
-        param.put("mainInfo",data);
-        JSONObject steelInfo =new JSONObject();
-        steelInfo.put("steelmakingWorksCode",data.getSteelmakingWorksCode());
-        steelInfo.put("steelmakingFurnaceCode",data.getSteelmakingWorksCode());
-        steelInfo.put("refiningFurnaceCode",data.getSteelmakingWorksCode());
-        steelInfo.put("ladleCode",data.getSteelmakingWorksCode());
-        steelInfo.put("continuousCasterCode",data.getContinuousCasterCode());
-        param.put("steelInfo",steelInfo);
-        RtfUtils.getMesRtf().userDataAdd("1", "1", WorkUtils.convertMapToBody(param)).subscribe(new WorkObserver<BaseMesBean>() {
+        param.put("mainInfo", data);
+        JSONObject steelInfo = new JSONObject();
+        steelInfo.put("steelmakingWorksCode", data.getSteelmakingWorksCode());
+//        steelInfo.put("steelmakingFurnaceCode", data.getSteelmakingWorksCode());
+//        steelInfo.put("refiningFurnaceCode", data.getSteelmakingWorksCode());
+//        steelInfo.put("ladleCode", data.getSteelmakingWorksCode());
+        steelInfo.put("continuousCasterCode", data.getContinuousCasterCode());
+        param.put("steelInfo", steelInfo);
+        showLoading();
+        RtfUtils.getMesRtf().userDataAdd("1", "1", 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/user/MesUserDataDetailActivity.java

 package com.wd.workoffice.ui.activity.mes.user;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -9,14 +13,19 @@ import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 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.bean.mesBean.MchineDetailBean;
+import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
+import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -24,6 +33,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import flexible.xd.android_base.utils.TimeUtils;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -33,10 +43,95 @@ import io.reactivex.disposables.Disposable;
  * github: https://github.com/FlexibleXd
  **/
 public class MesUserDataDetailActivity extends WorkToolBarActivity {
+    RelativeLayout rlGoMiddle;
+    @BindView(R.id.btn_refuse)
+    Button btnRefuse;
+    @BindView(R.id.btn_reviews)
+    Button btnReviews;
+    @BindView(R.id.ll_bottom)
+    LinearLayout llBottom;
+    @BindView(R.id.tv_reason)
+    TextView tvReason;
+    @BindView(R.id.ll_reason)
+    LinearLayout llReason;
+    @BindView(R.id.iv_modify_client)
+    ImageView ivModifyClient;
     @BindView(R.id.tv_client)
     TextView tvClient;
     @BindView(R.id.rl_client)
     RelativeLayout rlClient;
+    @BindView(R.id.tv_sale)
+    TextView tvSale;
+    @BindView(R.id.tv_manager)
+    TextView tvManager;
+    @BindView(R.id.iv_modify_steel)
+    ImageView ivModifySteel;
+    @BindView(R.id.tv_factory)
+    TextView tvFactory;
+    @BindView(R.id.tv_num)
+    TextView tvNum;
+    @BindView(R.id.tv_type)
+    TextView tvType;
+    @BindView(R.id.rv_factory_data1)
+    RecyclerView rvFactoryData1;
+    @BindView(R.id.rv_factory_data2)
+    RecyclerView rvFactoryData2;
+    @BindView(R.id.rv_factory_data3)
+    RecyclerView rvFactoryData3;
+    @BindView(R.id.iv_modify_machine)
+    ImageView ivModifyMachine;
+    @BindView(R.id.tv_machine_type)
+    TextView tvMachineType;
+    @BindView(R.id.tv_section)
+    TextView tvSection;
+    @BindView(R.id.tv_steel_type)
+    TextView tvSteelType;
+    @BindView(R.id.tv_speed)
+    TextView tvSpeed;
+    @BindView(R.id.rl_middle)
+    RelativeLayout rlMiddle;
+    @BindView(R.id.tv_middle1)
+    TextView tvMiddle1;
+    @BindView(R.id.tv_middle2)
+    TextView tvMiddle2;
+    @BindView(R.id.tv_middle3)
+    TextView tvMiddle3;
+    @BindView(R.id.tv_middle4)
+    TextView tvMiddle4;
+    @BindView(R.id.tv_middle5)
+    TextView tvMiddle5;
+    @BindView(R.id.tv_middle6)
+    TextView tvMiddle6;
+    @BindView(R.id.tv_middle7)
+    TextView tvMiddle7;
+    @BindView(R.id.tv_middle8)
+    TextView tvMiddle8;
+    @BindView(R.id.ll_middle)
+    LinearLayout llMiddle;
+    @BindView(R.id.rl_cover)
+    RelativeLayout rlCover;
+    @BindView(R.id.tv_cover1)
+    TextView tvCover1;
+    @BindView(R.id.tv_cover2)
+    TextView tvCover2;
+    @BindView(R.id.tv_cover3)
+    TextView tvCover3;
+    @BindView(R.id.tv_cover4)
+    TextView tvCover4;
+    @BindView(R.id.ll_cover)
+    LinearLayout llCover;
+    @BindView(R.id.rl_protection)
+    RelativeLayout rlProtection;
+    @BindView(R.id.tv_protection1)
+    TextView tvProtection1;
+    @BindView(R.id.tv_protection2)
+    TextView tvProtection2;
+    @BindView(R.id.tv_protection3)
+    TextView tvProtection3;
+    @BindView(R.id.tv_protection4)
+    TextView tvProtection4;
+    @BindView(R.id.ll_protection)
+    LinearLayout llProtection;
     @BindView(R.id.rv_data1)
     RecyclerView rvData1;
     @BindView(R.id.tv_add1)
@@ -53,25 +148,23 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
     TextView tvAdd4;
     @BindView(R.id.rl_add)
     RelativeLayout rlAdd;
-    @BindView(R.id.rv_factory_data1)
-    RecyclerView rvFactoryData1;
-    @BindView(R.id.rv_factory_data2)
-    RecyclerView rvFactoryData2;
-    @BindView(R.id.rv_factory_data3)
-    RecyclerView rvFactoryData3;
-    @BindView(R.id.tv_data3)
-    TextView tvData3;
-    @BindView(R.id.tv_add)
-    TextView tvAdd;
     private AccountBean dataBean;
     private UserDataMachineAdapter data1Adapter;
     private UserDataMachineAdapter data2Adapter;
     private UserDataMachineAdapter data3Adapter;
     private UserDataMachineAdapter data4Adapter;
+    private MchineDetailBean machineDetailBean;
+    private List<String> data1List;
+    private List<String> data2List;
+    private List<String> data3List;
+    private List<String> data4List;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
+        if (TextUtils.equals("1", getIntent().getStringExtra("from"))) {
+            llBottom.setVisibility(View.VISIBLE);
+        }
         rvData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
@@ -80,22 +173,10 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
-        List<Object> data1List = new ArrayList<>();
-        data1List.add(null);
-        data1List.add(null);
-        data1List.add(null);
-        List<Object> data2List = new ArrayList<>();
-        data2List.add(null);
-        data2List.add(null);
-        data2List.add(null);
-        List<Object> data3List = new ArrayList<>();
-        data3List.add(null);
-        data3List.add(null);
-        data3List.add(null);
-        List<Object> data4List = new ArrayList<>();
-        data4List.add(null);
-        data4List.add(null);
-        data4List.add(null);
+        data1List = new ArrayList<>();
+        data2List = new ArrayList<>();
+        data3List = new ArrayList<>();
+        data4List = new ArrayList<>();
         data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List);
         data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List);
         data3Adapter = new UserDataMachineAdapter(R.layout.item_machine, data3List);
@@ -108,9 +189,42 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
     }
 
     private void getData() {
-        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        Map<String, Object> param = WorkUtils.simpleParam();
+        param.put("id", getIntent().getStringExtra("id"));
+        RtfUtils.getMesRtf().userDataDetail("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.getMsg());
+                    return;
+                }
+                UserDataDetailBean userDataDetailBean = JSON.parseObject(data.getData().toString(), UserDataDetailBean.class);
+                UserDataDetailBean.MainInfoBean mainInfo = userDataDetailBean.getMainInfo();
+                if (mainInfo != null) {
+                    tvClient.setText(mainInfo.getCustomerUserName());
+                    tvManager.setText(mainInfo.getSalesManagerName());
+                    tvSale.setText(mainInfo.getSalesCompanyName());
+                }
+                getMachineData(userDataDetailBean.getSteelInfo().getContinuousCasterCode());
+            }
+        });
+    }
 
+    private void getMachineData(String code) {
+        Map<String, Object> param = WorkUtils.simpleParam();
+        param.put("continuousCasterCode", code);
+        RtfUtils.getMesRtf().machineDetail("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -122,21 +236,83 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
             }
 
             @Override
-            public void onSuccess(BaseBean data) {
+            public void onSuccess(BaseMesBean data) {
                 hideLoading();
-                if (data.getCode() != 0) {
-                    toast(data.getMessage());
+                if (!data.isSuccess()) {
+                    toast(data.getMsg());
                     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()));
+                machineDetailBean = JSON.parseObject(data.getData().toString(), MchineDetailBean.class);
+                MchineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
+                if (castInfo != null) {
+                    tvMachineType.setText(castInfo.getContinuousCasterName());
+                    tvSection.setText(castInfo.getFractureSurface());
+                    tvSteelType.setText(castInfo.getSteelGrade());
+                    tvSpeed.setText(castInfo.getCastingSpeed());
+                }
+                MchineDetailBean.CastLadleBean castLadle = machineDetailBean.getCastLadle();
+                if (castLadle != null) {
+                    tvMiddle1.setText(castLadle.getCapacity());
+                    tvMiddle2.setText(castLadle.getLifeSpan());
+                    tvMiddle3.setText(castLadle.getLadleCode());
+                    tvMiddle4.setText(castLadle.getLiquidLevel());
+                    tvMiddle5.setText(castLadle.getLiquidSteelTemperature());
+                    tvMiddle6.setText(castLadle.getBakingMethod());
+                    tvMiddle7.setText(castLadle.getBakingTemperature());
+                    tvMiddle8.setText(TimeUtils.millis2String(castLadle.getBakingDateTime()));
+                }
+                MchineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
+                if (covAgent != null) {
+                    tvCover1.setText(covAgent.getLadleCoveringAgentName());
+                    tvCover2.setText(covAgent.getAcidAlkaliDegree());
+                    tvCover3.setText(covAgent.getChemicalComposition());
+                    tvCover4.setText(covAgent.getSupplierName());
+                }
+                MchineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
+                if (mouldFlu != null) {
+                    tvProtection1.setText(mouldFlu.getMouldFluxesName());
+                    tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
+                    tvProtection3.setText(mouldFlu.getChemicalComposition());
+                    tvProtection4.setText(mouldFlu.getSupplierName());
+                }
+                changeList();
+
+
             }
         });
     }
 
+    private void changeList() {
+        data1List.clear();
+        data2List.clear();
+        data3List.clear();
+        data4List.clear();
+        if (machineDetailBean.getProductList() != null) {
+            for (MchineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
+                data1List.add(productListBean.getProductsName());
+            }
+            data1Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getSupplyList() != null) {
+            for (MchineDetailBean.SupplyListBean productListBean : machineDetailBean.getSupplyList()) {
+                data2List.add(productListBean.getProductsName());
+            }
+            data2Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getOtherSupList() != null) {
+            for (MchineDetailBean.OtherSupListBean productListBean : machineDetailBean.getOtherSupList()) {
+                data3List.add(productListBean.getSupplierName());
+            }
+            data3Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getOtherLadleList() != null) {
+            for (MchineDetailBean.OtherLadleListBean productListBean : machineDetailBean.getOtherLadleList()) {
+                data4List.add(productListBean.getRefractoryName());
+            }
+            data4Adapter.notifyDataSetChanged();
+        }
+    }
+
     @Override
     protected void initEvent() {
         data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java

@@ -137,7 +137,8 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-//                startActivity(MesTicketDetailFinishActivity.class);
+                startActivity(MesUserDataDetailActivity.class,"from","0","id",
+                        dataList.get(position).getId());
             }
         });
     }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListCheckActivity.java

@@ -16,6 +16,7 @@ import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketAddActivity;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketDetailFinishActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListTakeOnActivity;
 import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
@@ -57,6 +58,7 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
     @Override
     protected void initView() {
         ButterKnife.bind(this);
+        tvGo.setVisibility(View.GONE);
         rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         tvGo.setText("任务担当\n" +
                 "页面");
@@ -128,7 +130,8 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-//                startActivity(MesTicketDetailFinishActivity.class);
+                startActivity(MesUserDataDetailActivity.class,"from","1","id",
+                        dataList.get(position).getId());
             }
         });
     }

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

@@ -11,7 +11,8 @@
         android:layout_alignParentBottom="true"
         android:background="@color/white"
         android:gravity="center"
-        android:paddingVertical="10mm">
+        android:paddingVertical="10mm"
+        android:visibility="gone">
 
         <Button
             android:id="@+id/btn_refuse"
@@ -38,12 +39,13 @@
         android:layout_height="match_parent"
         android:layout_above="@id/ll_bottom">
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
 
             <LinearLayout
+                android:id="@+id/ll_reason"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@android:color/white"
@@ -59,6 +61,7 @@
                     android:textSize="15sp" />
 
                 <TextView
+                    android:id="@+id/tv_reason"
                     android:layout_width="140dp"
                     android:layout_height="22dp"
                     android:text="这是一条狠心的驳回"
@@ -79,6 +82,7 @@
                     android:textSize="18sp" />
 
                 <ImageView
+                    android:id="@+id/iv_modify_client"
                     android:layout_width="22mm"
                     android:layout_height="22mm"
                     android:layout_alignParentRight="true"
@@ -105,12 +109,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_client"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="111111"
                     android:textSize="14sp" />
 
             </RelativeLayout>
@@ -133,12 +137,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_sale"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="111111"
                     android:textSize="14sp" />
 
             </RelativeLayout>
@@ -161,12 +165,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_manager"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="111111"
                     android:textSize="14sp" />
 
             </RelativeLayout>
@@ -184,6 +188,7 @@
                     android:textSize="18sp" />
 
                 <ImageView
+                    android:id="@+id/iv_modify_steel"
                     android:layout_width="22mm"
                     android:layout_height="22mm"
                     android:layout_alignParentRight="true"
@@ -208,12 +213,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_factory"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="111111"
                     android:textSize="14sp" />
 
             </RelativeLayout>
@@ -236,12 +241,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_num"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="111111"
                     android:textSize="14sp" />
 
             </RelativeLayout>
@@ -264,12 +269,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="111111"
                     android:textSize="14sp" />
 
             </RelativeLayout>
@@ -294,7 +299,7 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_factory_data1"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true" />
             </RelativeLayout>
@@ -319,7 +324,7 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_factory_data2"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true" />
             </RelativeLayout>
@@ -343,7 +348,7 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_factory_data3"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true" />
             </RelativeLayout>
@@ -361,6 +366,7 @@
                     android:textSize="18sp" />
 
                 <ImageView
+                    android:id="@+id/iv_modify_machine"
                     android:layout_width="22mm"
                     android:layout_height="22mm"
                     android:layout_alignParentRight="true"
@@ -386,12 +392,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_machine_type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
 
             </RelativeLayout>
@@ -414,12 +420,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_section"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -440,12 +446,12 @@
                     android:textSize="14sp" />
 
                 <TextView
+                    android:id="@+id/tv_steel_type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -466,16 +472,263 @@
                     android:textSize="14sp" />
 
                 <TextView
+                    android:id="@+id/tv_speed"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="拉速"
                     android:textSize="14sp" />
             </RelativeLayout>
 
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                android:id="@+id/rl_middle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:text="中间包参数"
+                    android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="3mm"
+                    android:src="@mipmap/mes_arrow_down" />
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <LinearLayout
+                android:id="@+id/ll_middle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                android:orientation="vertical"
+                android:paddingHorizontal="20mm">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/white"
+                    android:paddingVertical="9mm"
+                    android:paddingLeft="25mm">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:text="容量"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+
+                    <TextView
+                        android:id="@+id/tv_middle1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="3mm"
+                        android:background="@null"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/white"
+                    android:paddingVertical="9mm"
+                    android:paddingLeft="25mm">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:text="寿命"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+
+                    <TextView
+                        android:id="@+id/tv_middle2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="3mm"
+                        android:background="@null"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/white"
+                    android:paddingVertical="9mm"
+                    android:paddingLeft="25mm">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:text="类型"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+
+                    <TextView
+                        android:id="@+id/tv_middle3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="3mm"
+                        android:background="@null"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/white"
+                    android:paddingVertical="9mm"
+                    android:paddingLeft="25mm">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:text="液位"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+
+                    <TextView
+                        android:id="@+id/tv_middle4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="3mm"
+                        android:background="@null"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/white"
+                    android:paddingVertical="9mm"
+                    android:paddingLeft="25mm">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:text="钢水温度"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+
+                    <TextView
+                        android:id="@+id/tv_middle5"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="3mm"
+                        android:background="@null"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/white"
+                    android:paddingVertical="9mm"
+                    android:paddingLeft="25mm">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:text="烘烤方式"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+
+                    <TextView
+                        android:id="@+id/tv_middle6"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="3mm"
+                        android:background="@null"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/white"
+                    android:paddingVertical="9mm"
+                    android:paddingLeft="25mm">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:text="烘烤温度"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+
+                    <TextView
+                        android:id="@+id/tv_middle7"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="3mm"
+                        android:background="@null"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/white"
+                    android:paddingVertical="9mm"
+                    android:paddingLeft="25mm">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:text="烘烤时间"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+
+                    <TextView
+                        android:id="@+id/tv_middle8"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="3mm"
+                        android:background="@null"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+            </LinearLayout>
+
+            <View style="@style/dividerX" />
+
             <RelativeLayout
+                android:id="@+id/rl_cover"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@android:color/white"
@@ -500,6 +753,7 @@
             <View style="@style/dividerX" />
 
             <LinearLayout
+                android:id="@+id/ll_cover"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@android:color/white"
@@ -514,6 +768,7 @@
                     android:paddingLeft="25mm">
 
                     <TextView
+
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentLeft="true"
@@ -523,12 +778,12 @@
 
 
                     <TextView
+                        android:id="@+id/tv_cover1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="3mm"
                         android:background="@null"
-                        android:text="请输入"
                         android:textSize="14sp" />
                 </RelativeLayout>
 
@@ -549,12 +804,12 @@
 
 
                     <TextView
+                        android:id="@+id/tv_cover2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="3mm"
                         android:background="@null"
-                        android:text="请输入"
                         android:textSize="14sp" />
                 </RelativeLayout>
 
@@ -575,12 +830,12 @@
 
 
                     <TextView
+                        android:id="@+id/tv_cover3"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="3mm"
                         android:background="@null"
-                        android:text="请输入"
                         android:textSize="14sp" />
                 </RelativeLayout>
 
@@ -601,12 +856,12 @@
 
 
                     <TextView
+                        android:id="@+id/tv_cover4"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="3mm"
                         android:background="@null"
-                        android:text="请输入"
                         android:textSize="14sp" />
                 </RelativeLayout>
             </LinearLayout>
@@ -614,6 +869,7 @@
             <View style="@style/dividerX" />
 
             <RelativeLayout
+                android:id="@+id/rl_protection"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@android:color/white"
@@ -638,6 +894,7 @@
             <View style="@style/dividerX" />
 
             <LinearLayout
+                android:id="@+id/ll_protection"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@android:color/white"
@@ -661,12 +918,12 @@
 
 
                     <TextView
+                        android:id="@+id/tv_protection1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="3mm"
                         android:background="@null"
-                        android:text="请输入"
                         android:textSize="14sp" />
                 </RelativeLayout>
 
@@ -687,12 +944,12 @@
 
 
                     <TextView
+                        android:id="@+id/tv_protection2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="3mm"
                         android:background="@null"
-                        android:text="请输入"
                         android:textSize="14sp" />
                 </RelativeLayout>
 
@@ -713,12 +970,12 @@
 
 
                     <TextView
+                        android:id="@+id/tv_protection3"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="3mm"
                         android:background="@null"
-                        android:text="请输入"
                         android:textSize="14sp" />
                 </RelativeLayout>
 
@@ -739,12 +996,12 @@
 
 
                     <TextView
+                        android:id="@+id/tv_protection4"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="3mm"
                         android:background="@null"
-                        android:text="请输入"
                         android:textSize="14sp" />
                 </RelativeLayout>
             </LinearLayout>
@@ -767,6 +1024,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
+                    android:gravity="right"
                     android:orientation="vertical">
 
                     <androidx.recyclerview.widget.RecyclerView
@@ -776,8 +1034,9 @@
 
                     <TextView
                         android:id="@+id/tv_add1"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="right"
                         android:text="添加 +"
                         android:textSize="16sp" />
                 </LinearLayout>
@@ -788,6 +1047,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10mm"
                 android:background="@android:color/white"
+                android:gravity="right"
                 android:paddingHorizontal="20mm"
                 android:paddingVertical="9mm">
 
@@ -802,7 +1062,8 @@
                     android:id="@+id/rv_data2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true" />
+                    android:layout_alignParentRight="true"
+                    android:layout_gravity="right" />
 
             </RelativeLayout>
 
@@ -810,6 +1071,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="10mm"
                 android:background="@android:color/white"
                 android:paddingHorizontal="20mm"
                 android:paddingVertical="9mm">
@@ -825,18 +1087,21 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
+                    android:gravity="right"
                     android:orientation="vertical">
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_data3"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-                    t
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right" />
+
 
                     <TextView
-                        android:id="@+id/tv_data3"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/tv_add3"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="right"
                         android:text="添加 +"
                         android:textSize="16sp" />
                 </LinearLayout>
@@ -845,6 +1110,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="10mm"
                 android:background="@android:color/white"
                 android:paddingHorizontal="20mm"
                 android:paddingVertical="9mm">
@@ -860,6 +1126,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
+                    android:gravity="right"
                     android:orientation="vertical">
 
                     <androidx.recyclerview.widget.RecyclerView
@@ -869,8 +1136,9 @@
 
                     <TextView
                         android:id="@+id/tv_add4"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="right"
                         android:text="添加 +"
                         android:textSize="16sp" />
                 </LinearLayout>
@@ -895,7 +1163,6 @@
 
 
                 <TextView
-                    android:id="@+id/tv_add"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"