1.连铸机，工厂编辑

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.支数参数

app/src/main/AndroidManifest.xml

@@ -1834,6 +1834,23 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.user.MesChooseMachineModifyActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="编辑连铸机"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.user.MesChooseFactoryModifyActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="编辑炼钢厂"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/bean/event/ModifyFactoryEvent.java

+package com.wd.workoffice.bean.event;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class ModifyFactoryEvent {
+
+    public ModifyFactoryEvent() {
+    }
+
+}

app/src/main/java/com/wd/workoffice/bean/event/ModifyMachineEvent.java

+package com.wd.workoffice.bean.event;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class ModifyMachineEvent {
+
+    public ModifyMachineEvent() {
+    }
+
+}

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

+package com.wd.workoffice.ui.activity.mes.user;
+
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.AddFactoryEvent;
+import com.wd.workoffice.bean.event.AddUserDataEvent;
+import com.wd.workoffice.bean.event.ModifyFactoryEvent;
+import com.wd.workoffice.bean.event.ModifyUserDataEvent;
+import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.UserDataAdd3AddAdapter;
+import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAddAdapter;
+import com.wd.workoffice.ui.adapter.UserDataAdd3RefAddAdapter;
+import com.wd.workoffice.util.PickTimeUtils;
+import com.wd.workoffice.util.WorkUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+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;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+/**
+ * 用户数据采集，编辑炼钢厂
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesChooseFactoryModifyActivity extends WorkToolBarActivity {
+    @BindView(R.id.et_name)
+    EditText etName;
+    @BindView(R.id.et_sum)
+    EditText etSum;
+    @BindView(R.id.et_type)
+    EditText etType;
+    @BindView(R.id.rv_data1)
+    RecyclerView rvData1;
+    @BindView(R.id.tv_add1)
+    TextView tvAdd1;
+    @BindView(R.id.rv_data2)
+    RecyclerView rvData2;
+    @BindView(R.id.tv_add2)
+    TextView tvAdd2;
+    @BindView(R.id.rv_data3)
+    RecyclerView rvData3;
+    @BindView(R.id.tv_add3)
+    TextView tvAdd3;
+    @BindView(R.id.rl_factory)
+    RelativeLayout rlFactory;
+    private List<FactoryDetailBean.SteelFurnListBean> data1List;
+    private List<FactoryDetailBean.SteelRefFurnListBean> data2List;
+    private List<FactoryDetailBean.SteelLadleListBean> data3List;
+    private UserDataAdd3AddAdapter data1Adapter;
+    private UserDataAdd3RefAddAdapter data2Adapter;
+    private UserDataAdd3LabelAddAdapter data3Adapter;
+    private UserDataBean.ListBean data;
+    private FactoryDetailBean factoryDetailBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rlFactory.setVisibility(View.GONE);
+        rvData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+
+    }
+
+    @Override
+    protected void initData() {
+        data = JSON.parseObject(getIntent().getStringExtra("data"), UserDataBean.ListBean.class);
+        data1List = new ArrayList<>();
+        data2List = new ArrayList<>();
+        data3List = new ArrayList<>();
+        data1Adapter = new UserDataAdd3AddAdapter(R.layout.item_user_add3_add, data1List);
+        data2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add, data2List);
+        data3Adapter = new UserDataAdd3LabelAddAdapter(R.layout.item_user_add_factory_label, data3List);
+        data1Adapter.bindToRecyclerView(rvData1);
+        data2Adapter.bindToRecyclerView(rvData2);
+        data3Adapter.bindToRecyclerView(rvData3);
+        getFactoryData(data.getSteelmakingWorksCode());
+    }
+
+    private void getFactoryData(String code) {
+        Map<String, Object> param = WorkUtils.simpleParam();
+        param.put("steelmakingWorksCode", code);
+        RtfUtils.getMesRtf().factoryDetail("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;
+                }
+                factoryDetailBean = JSON.parseObject(data.getData().toString(), FactoryDetailBean.class);
+                FactoryDetailBean.SteelWorksBean steelWorks = factoryDetailBean.getSteelWorks();
+                if (steelWorks != null) {
+                    etSum.setText(steelWorks.getAnnualOutput());
+                    etName.setText(steelWorks.getSteelmakingWorksName());
+                    etType.setText(steelWorks.getSteelGrade());
+                }
+                if (factoryDetailBean.getSteelFurnList() != null) {
+                    data1List.clear();
+                    data1List.addAll(factoryDetailBean.getSteelFurnList());
+                    data1Adapter.notifyDataSetChanged();
+                }
+                if (factoryDetailBean.getSteelRefFurnList() != null) {
+                    data2List.clear();
+                    data2List.addAll(factoryDetailBean.getSteelRefFurnList());
+                    data2Adapter.notifyDataSetChanged();
+                }
+                if (factoryDetailBean.getSteelLadleList() != null) {
+                    data3List.clear();
+                    data3List.addAll(factoryDetailBean.getSteelLadleList());
+                    data3Adapter.notifyDataSetChanged();
+                }
+
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        data1Adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                data1List.remove(position);
+                data1Adapter.notifyDataSetChanged();
+            }
+        });
+        data2Adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                data2List.remove(position);
+                data2Adapter.notifyDataSetChanged();
+            }
+        });
+        data3Adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                switch (view.getId()) {
+                    case R.id.tv_delete:
+                        data3List.remove(position);
+                        data3Adapter.notifyDataSetChanged();
+                        break;
+                    case R.id.rl_time:
+                        PickTimeUtils.showPickThree(MesChooseFactoryModifyActivity.this, new OnTimeSelectListener() {
+                            @Override
+                            public void onTimeSelect(Date date, View v) {
+                                data3List.get(position).setCastingDateTime(TimeUtils.date2Millis(date) / 1000);
+                                data3Adapter.notifyDataSetChanged();
+                            }
+                        }).show();
+                        break;
+                }
+
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_user_data_factory_add;
+    }
+
+
+    @OnClick({R.id.tv_add1, R.id.tv_add2, R.id.tv_add3})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_add1:
+                FactoryDetailBean.SteelFurnListBean data1 = new FactoryDetailBean.SteelFurnListBean();
+                data1List.add(data1);
+                data1Adapter.notifyDataSetChanged();
+                break;
+            case R.id.tv_add2:
+                FactoryDetailBean.SteelRefFurnListBean data2 = new FactoryDetailBean.SteelRefFurnListBean();
+                data2List.add(data2);
+                data2Adapter.notifyDataSetChanged();
+                break;
+            case R.id.tv_add3:
+                FactoryDetailBean.SteelLadleListBean data3 = new FactoryDetailBean.SteelLadleListBean();
+                data3List.add(data3);
+                data3Adapter.notifyDataSetChanged();
+                break;
+
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_finish, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.finish:
+                submit();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void submit() {
+        if (!checkParam()) {
+            return;
+        }
+        FactoryDetailBean.SteelWorksBean steelWorks = factoryDetailBean.getSteelWorks();
+        if (steelWorks != null) {
+            steelWorks.setAnnualOutput(etSum.getText().toString());
+            steelWorks.setSteelmakingWorksName(etName.getText().toString());
+            steelWorks.setSteelGrade(etType.getText().toString());
+        }
+        if (factoryDetailBean.getSteelFurnList() != null) {
+            factoryDetailBean.getSteelFurnList().clear();
+            factoryDetailBean.getSteelFurnList().addAll(data1List);
+        }
+        if (factoryDetailBean.getSteelRefFurnList() != null) {
+            factoryDetailBean.getSteelRefFurnList().clear();
+            factoryDetailBean.getSteelRefFurnList().addAll(data2List);
+        }
+        if (factoryDetailBean.getSteelLadleList() != null) {
+            factoryDetailBean.getSteelLadleList().clear();
+            factoryDetailBean.getSteelLadleList().addAll(data3List);
+        }
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), JSON.toJSONString(factoryDetailBean));
+        showLoading();
+        RtfUtils.getMesRtf().factoryAdd("1", "2", requestBody).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("编辑成功");
+                EventBus.getDefault().post(new ModifyFactoryEvent());
+                finish();
+            }
+        });
+    }
+
+
+    private boolean checkParam() {
+        boolean dataHasNull = false;
+        for (FactoryDetailBean.SteelFurnListBean steelFurnListBean : data1List) {
+            if (TextUtils.isEmpty(steelFurnListBean.getCapacity())
+                    || TextUtils.isEmpty(steelFurnListBean.getType())) {
+                dataHasNull = true;
+            }
+        }
+        if (dataHasNull) {
+            toast("请填写炼钢厂数据");
+            return false;
+        }
+        for (FactoryDetailBean.SteelRefFurnListBean steelRefFurnListBean : data2List) {
+            if ( TextUtils.isEmpty(steelRefFurnListBean.getModelNumber())
+                    || TextUtils.isEmpty(steelRefFurnListBean.getCalciumTreatmentSituation())) {
+                dataHasNull = true;
+            }
+        }
+        if (dataHasNull) {
+            toast("请填写精炼厂数据");
+            return false;
+        }
+        for (FactoryDetailBean.SteelLadleListBean steelLadleListBean : data3List) {
+            if (TextUtils.isEmpty(steelLadleListBean.getCapacity()) || steelLadleListBean.getCastingDateTime() == null
+                    || TextUtils.isEmpty(steelLadleListBean.getTemperatureRange())) {
+                dataHasNull = true;
+            }
+        }
+        if (dataHasNull) {
+            toast("请填写钢包数据");
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void finish(AddUserDataEvent event) {
+        finish();
+    }
+}

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

@@ -398,7 +398,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_finish, menu);
+        getMenuInflater().inflate(R.menu.menu_machine_finish, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -408,6 +408,10 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
             case R.id.finish:
                 submit();
                 break;
+            case R.id.modify:
+                startActivity(MesChooseMachineModifyActivity.class,
+                        "data",JSON.toJSONString(data));
+                break;
         }
         return super.onOptionsItemSelected(item);
     }

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

+package com.wd.workoffice.ui.activity.mes.user;
+
+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.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.ModifyMachineEvent;
+import com.wd.workoffice.bean.event.ModifyUserDataEvent;
+import com.wd.workoffice.bean.event.RefreshMachineEvent;
+import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
+import com.wd.workoffice.bean.mesBean.MachineDetailBean;
+import com.wd.workoffice.bean.mesBean.MesClientBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
+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.UserDataAdd3LabelAdapter;
+import com.wd.workoffice.ui.adapter.UserDataDetailFactory1Adapter;
+import com.wd.workoffice.ui.adapter.UserDataDetailFactory2Adapter;
+import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
+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.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+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;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+
+/**
+ * 用户数据采集，
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_machine_name)
+    EditText tvMachineName;
+    @BindView(R.id.tv_machine_type)
+    EditText tvMachineType;
+    @BindView(R.id.tv_section)
+    EditText tvSection;
+    @BindView(R.id.tv_steel_type)
+    EditText tvSteelType;
+    @BindView(R.id.tv_speed)
+    EditText tvSpeed;
+    @BindView(R.id.rl_middle)
+    RelativeLayout rlMiddle;
+    @BindView(R.id.tv_middle1)
+    EditText tvMiddle1;
+    @BindView(R.id.tv_middle2)
+    EditText tvMiddle2;
+    @BindView(R.id.tv_middle3)
+    EditText tvMiddle3;
+    @BindView(R.id.tv_middle4)
+    EditText tvMiddle4;
+    @BindView(R.id.tv_middle5)
+    EditText tvMiddle5;
+    @BindView(R.id.tv_middle6)
+    EditText tvMiddle6;
+    @BindView(R.id.tv_middle7)
+    EditText tvMiddle7;
+    @BindView(R.id.tv_middle8)
+    EditText tvMiddle8;
+    @BindView(R.id.ll_middle)
+    LinearLayout llMiddle;
+    @BindView(R.id.rl_cover)
+    RelativeLayout rlCover;
+    @BindView(R.id.tv_cover1)
+    EditText tvCover1;
+    @BindView(R.id.tv_cover2)
+    EditText tvCover2;
+    @BindView(R.id.tv_cover3)
+    EditText tvCover3;
+    @BindView(R.id.tv_cover4)
+    TextView tvCover4;
+    @BindView(R.id.rl_cover4)
+    RelativeLayout rlCover4;
+    @BindView(R.id.ll_cover)
+    LinearLayout llCover;
+    @BindView(R.id.rl_protection)
+    RelativeLayout rlProtection;
+    @BindView(R.id.tv_protection1)
+    EditText tvProtection1;
+    @BindView(R.id.tv_protection2)
+    EditText tvProtection2;
+    @BindView(R.id.tv_protection3)
+    EditText tvProtection3;
+    @BindView(R.id.tv_protection4)
+    TextView tvProtection4;
+    @BindView(R.id.rl_protection4)
+    RelativeLayout rlProtection4;
+    @BindView(R.id.ll_protection)
+    LinearLayout llProtection;
+    @BindView(R.id.rv_data1)
+    RecyclerView rvData1;
+    @BindView(R.id.tv_add1)
+    TextView tvAdd1;
+    @BindView(R.id.rv_data2)
+    RecyclerView rvData2;
+    @BindView(R.id.tv_add2)
+    TextView tvAdd2;
+    @BindView(R.id.rv_data3)
+    RecyclerView rvData3;
+    @BindView(R.id.tv_add3)
+    TextView tvAdd3;
+    @BindView(R.id.rv_data5)
+    RecyclerView rvData5;
+    @BindView(R.id.tv_add5)
+    TextView tvAdd5;
+    @BindView(R.id.rv_data4)
+    RecyclerView rvData4;
+    @BindView(R.id.tv_add4)
+    TextView tvAdd4;
+    @BindView(R.id.rv_data6)
+    RecyclerView rvData6;
+    @BindView(R.id.tv_add6)
+    TextView tvAdd6;
+    @BindView(R.id.rl_add)
+    RelativeLayout rlAdd;
+    private UserDataMachineAdapter data1Adapter;
+    private UserDataMachineAdapter data2Adapter;
+    private UserDataMachineAdapter data3Adapter;
+    private UserDataMachineAdapter data4Adapter;
+    private MachineDetailBean machineDetailBean;
+    private List<String> data1List;
+    private List<String> data2List;
+    private List<String> data3List;
+    private List<String> data4List;
+    private UserDataMachineAdapter data5Adapter;
+    private UserDataMachineAdapter data6Adapter;
+    private List<String> data5List;
+    private List<String> data6List;
+    private boolean canFinish;
+    private UserDataBean.ListBean data;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+
+
+    }
+
+    @Override
+    protected void initData() {
+        data = JSON.parseObject(getIntent().getStringExtra("data"), UserDataBean.ListBean.class);
+        data1List = new ArrayList<>();
+        data2List = new ArrayList<>();
+        data3List = new ArrayList<>();
+        data4List = new ArrayList<>();
+        data5List = new ArrayList<>();
+        data6List = 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);
+        data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
+        data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
+        data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
+        data1Adapter.bindToRecyclerView(rvData1);
+        data2Adapter.bindToRecyclerView(rvData2);
+        data3Adapter.bindToRecyclerView(rvData3);
+        data4Adapter.bindToRecyclerView(rvData4);
+        data5Adapter.bindToRecyclerView(rvData5);
+        data6Adapter.bindToRecyclerView(rvData6);
+        getMachineData(data.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) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
+                MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
+                if (castInfo != null) {
+                    tvMachineType.setText(castInfo.getContinuousCasterType());
+                    tvMachineName.setText(castInfo.getContinuousCasterName());
+                    tvSection.setText(castInfo.getFractureSurface());
+                    tvSteelType.setText(castInfo.getSteelGrade());
+                    tvSpeed.setText(castInfo.getCastingSpeed());
+                }
+                MachineDetailBean.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(String.valueOf(castLadle.getBakingDateTime()));
+                }
+                MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
+                if (covAgent != null) {
+                    tvCover1.setText(covAgent.getLadleCoveringAgentName());
+                    tvCover2.setText(covAgent.getAcidAlkaliDegree());
+                    tvCover3.setText(covAgent.getChemicalComposition());
+                    tvCover4.setText(covAgent.getSupplierName());
+                }
+                MachineDetailBean.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();
+        data5List.clear();
+        data6List.clear();
+        if (machineDetailBean.getProductList() != null) {
+            for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
+                data1List.add(productListBean.getProductsName());
+            }
+            data1Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getSupplyList() != null) {
+            for (MachineDetailBean.SupplyListBean productListBean : machineDetailBean.getSupplyList()) {
+                data2List.add(productListBean.getProductsName());
+            }
+            data2Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getOtherSupList() != null) {
+            for (MachineDetailBean.OtherSupListBean productListBean : machineDetailBean.getOtherSupList()) {
+                data3List.add(productListBean.getSupplierName());
+            }
+            data3Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getOtherLadleList() != null) {
+            for (MachineDetailBean.OtherLadleListBean productListBean : machineDetailBean.getOtherLadleList()) {
+                data4List.add(productListBean.getRefractoryName());
+            }
+            data4Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getStockList() != null) {
+            for (MachineDetailBean.StockListBean productListBean : machineDetailBean.getStockList()) {
+                data5List.add(productListBean.getProductsName());
+            }
+            data5Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getSettleList() != null) {
+            for (MachineDetailBean.SettleListBean productListBean : machineDetailBean.getSettleList()) {
+                data6List.add(productListBean.getSettlementMethod());
+            }
+            data6Adapter.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    protected void initEvent() {
+        data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getProductList().get(position)));
+            }
+        });
+        data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
+            }
+        });
+        data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherSupList().get(position)));
+            }
+        });
+        data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getOtherLadleList().get(position)));
+
+            }
+        });
+        data5Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(MesStockModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
+            }
+        });
+        data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_user_data_machine_modify;
+    }
+
+
+    @OnClick({R.id.rl_cover4, R.id.rl_protection4,
+            R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
+            R.id.tv_add4})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.rl_cover4:
+                startActivityForResult(MesChooseClientActivity.class,
+                        10001, "from", "1");
+                break;
+            case R.id.rl_protection4:
+                startActivityForResult(MesChooseClientActivity.class,
+                        10002, "from", "1");
+                break;
+            case R.id.tv_add1:
+                if (machineDetailBean == null) {
+                    toast("数据加载中，请稍后");
+                    return;
+                }
+                startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
+                break;
+            case R.id.tv_add2:
+                if (machineDetailBean == null) {
+                    toast("数据加载中，请稍后");
+                    return;
+                }
+                startActivity(MesSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
+                break;
+            case R.id.tv_add3:
+                if (machineDetailBean == null) {
+                    toast("数据加载中，请稍后");
+                    return;
+                }
+                startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
+                break;
+            case R.id.tv_add4:
+                if (machineDetailBean == null) {
+                    toast("数据加载中，请稍后");
+                    return;
+                }
+                startActivity(MesPackageAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
+                break;
+            case R.id.tv_add5:
+                if (machineDetailBean == null) {
+                    toast("数据加载中，请稍后");
+                    return;
+                }
+                startActivity(MesStockAddActivity.class,
+                        "continuousCasterCode", data.getContinuousCasterCode()
+                        , "id", data.getCustomerUserCode());
+                break;
+            case R.id.tv_add6:
+                if (machineDetailBean == null) {
+                    toast("数据加载中，请稍后");
+                    return;
+                }
+                startActivity(MesMiddleAddActivity.class, "continuousCasterCode",
+                        data.getContinuousCasterCode());
+                break;
+            case R.id.rl_middle:
+                if (llMiddle.getVisibility() == View.VISIBLE) {
+                    llMiddle.setVisibility(View.GONE);
+                } else {
+                    llMiddle.setVisibility(View.VISIBLE);
+                }
+                break;
+            case R.id.rl_cover:
+                if (llCover.getVisibility() == View.VISIBLE) {
+                    llCover.setVisibility(View.GONE);
+                } else {
+                    llCover.setVisibility(View.VISIBLE);
+                }
+                break;
+            case R.id.rl_protection:
+                if (llProtection.getVisibility() == View.VISIBLE) {
+                    llProtection.setVisibility(View.GONE);
+                } else {
+                    llProtection.setVisibility(View.VISIBLE);
+                }
+                break;
+        }
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_finish, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.finish:
+                changeSimple();
+                submitMachine();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void changeSimple() {
+        MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
+        if (castInfo == null) {
+            castInfo = new MachineDetailBean.CastInfoBean();
+            machineDetailBean.setCastInfo(castInfo);
+        }
+        castInfo.setContinuousCasterName(tvMachineName.getText().toString());
+        castInfo.setContinuousCasterType(tvMachineType.getText().toString());
+        castInfo.setFractureSurface(tvSection.getText().toString());
+        castInfo.setSteelGrade(tvSteelType.getText().toString());
+        castInfo.setCastingSpeed(tvSpeed.getText().toString());
+
+        MachineDetailBean.CastLadleBean castLadle = machineDetailBean.getCastLadle();
+        if (castLadle == null) {
+            castLadle = new MachineDetailBean.CastLadleBean();
+            machineDetailBean.setCastLadle(castLadle);
+        }
+        castLadle.setCapacity(tvMiddle1.getText().toString());
+        castLadle.setLifeSpan(tvMiddle2.getText().toString());
+//        castLadle.setLadleCode(tvMiddle3.getText().toString());
+        castLadle.setLiquidLevel(tvMiddle4.getText().toString());
+        castLadle.setLiquidSteelTemperature(tvMiddle5.getText().toString());
+        castLadle.setBakingMethod(tvMiddle6.getText().toString());
+        castLadle.setBakingTemperature(tvMiddle7.getText().toString());
+        if (!TextUtils.isEmpty(tvMiddle8.getText().toString()))
+            castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
+
+        MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
+        if (covAgent == null) {
+            covAgent = new MachineDetailBean.CovAgentBean();
+            machineDetailBean.setCovAgent(covAgent);
+        }
+        covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
+        covAgent.setAcidAlkaliDegree(tvCover2.getText().toString());
+        covAgent.setChemicalComposition(tvCover3.getText().toString());
+        covAgent.setSupplierName(tvCover4.getText().toString());
+
+        MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
+        if (mouldFlu == null) {
+            mouldFlu = new MachineDetailBean.MouldFluBean();
+            machineDetailBean.setMouldFlu(mouldFlu);
+        }
+        mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
+        mouldFlu.setAcidAlkaliDegree(tvProtection2.getText().toString());
+        mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
+        mouldFlu.setSupplierName(tvProtection4.getText().toString());
+    }
+
+    private void submitMachine() {
+        showLoading();
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), JSON.toJSONString(machineDetailBean));
+        RtfUtils.getMesRtf().machineAdd("1", "2", requestBody).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("编辑成功");
+                finish();
+                EventBus.getDefault().post(new RefreshMachineEvent());
+            }
+        });
+    }
+
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(RefreshMachineEvent event) {
+        getMachineData(data.getContinuousCasterCode());
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case 10001:
+                if (resultCode == 10001) {
+                    MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
+                    MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
+                    if (covAgent == null) {
+                        covAgent = new MachineDetailBean.CovAgentBean();
+                        machineDetailBean.setCovAgent(covAgent);
+                    }
+                    tvCover4.setText(modifyClient.getCustomerName());
+                    covAgent.setSupplierCode(modifyClient.getCustomerCode());
+                    covAgent.setSupplierName(modifyClient.getCustomerName());
+                }
+                break;
+            case 10002:
+                if (resultCode == 10001) {
+                    MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
+                    MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
+                    if (mouldFlu == null) {
+                        mouldFlu = new MachineDetailBean.MouldFluBean();
+                        machineDetailBean.setMouldFlu(mouldFlu);
+                    }
+                    tvProtection4.setText(modifyClient.getCustomerName());
+                    mouldFlu.setSupplierCode(modifyClient.getCustomerCode());
+                    mouldFlu.setSupplierCode(modifyClient.getCustomerName());
+                }
+                break;
+        }
+    }
+
+}

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

 package com.wd.workoffice.ui.activity.mes.user;
 
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -8,6 +10,8 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
+import com.wd.workoffice.bean.event.ModifyFactoryEvent;
+import com.wd.workoffice.bean.event.ModifyMachineEvent;
 import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -116,18 +120,21 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
                     tvFactory.setText(steelWorks.getSteelmakingWorksName());
                     tvType.setText(steelWorks.getSteelGrade());
                 }
+                data1List.clear();
+                data2List.clear();
+                data3List.clear();
                 if (factoryDetailBean.getSteelFurnList() != null) {
                     data1List.addAll(factoryDetailBean.getSteelFurnList());
-                    data1Adapter.notifyDataSetChanged();
                 }
                 if (factoryDetailBean.getSteelRefFurnList() != null) {
                     data2List.addAll(factoryDetailBean.getSteelRefFurnList());
-                    data2Adapter.notifyDataSetChanged();
                 }
                 if (factoryDetailBean.getSteelLadleList() != null) {
                     data3List.addAll(factoryDetailBean.getSteelLadleList());
-                    data3Adapter.notifyDataSetChanged();
                 }
+                data1Adapter.notifyDataSetChanged();
+                data2Adapter.notifyDataSetChanged();
+                data3Adapter.notifyDataSetChanged();
 
             }
         });
@@ -142,21 +149,22 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
         return R.layout.activity_mes_user_data_add3;
     }
 
-//    @Override
-//    public boolean onCreateOptionsMenu(Menu menu) {
-//        getMenuInflater().inflate(R.menu.menu_finish, menu);
-//        return super.onCreateOptionsMenu(menu);
-//    }
-//
-//    @Override
-//    public boolean onOptionsItemSelected(MenuItem item) {
-//        switch (item.getItemId()) {
-//            case R.id.finish:
-//                startActivity(MesChooseClientActivity.class);
-//                break;
-//        }
-//        return super.onOptionsItemSelected(item);
-//    }
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_modify, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.modify:
+                startActivity(MesChooseFactoryModifyActivity.class,
+                        "data",JSON.toJSONString(data));
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 
     @OnClick(R.id.rl_machine)
     public void onViewClicked() {
@@ -174,8 +182,15 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
         EventBus.getDefault().unregister(this);
     }
 
+
     @Subscribe
     public void refresh(AddUserDataEvent event) {
         finish();
     }
+    @Subscribe
+    public void refresh(ModifyFactoryEvent event) {
+        getData();
+    }
+
+
 }

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

@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.mes.user;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -382,7 +383,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
                     tvMiddle5.setText(castLadle.getLiquidSteelTemperature());
                     tvMiddle6.setText(castLadle.getBakingMethod());
                     tvMiddle7.setText(castLadle.getBakingTemperature());
-                    tvMiddle8.setText(TimeUtils.millis2String(castLadle.getBakingDateTime()));
+                    tvMiddle8.setText(String.valueOf(castLadle.getBakingDateTime()));
                 }
                 MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
                 if (covAgent != null) {
@@ -683,7 +684,8 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
         castLadle.setLiquidSteelTemperature(tvMiddle5.getText().toString());
         castLadle.setBakingMethod(tvMiddle6.getText().toString());
         castLadle.setBakingTemperature(tvMiddle7.getText().toString());
-        castLadle.setBakingDateTime(TimeUtils.string2Millis(tvMiddle8.getText().toString()) / 1000);
+        if (!TextUtils.isEmpty(tvMiddle8.getText().toString()))
+            castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
 
         MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
         if (covAgent == null) {

app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3Adapter.java

@@ -34,7 +34,7 @@ public class UserDataAdd3Adapter extends BaseQuickAdapter<FactoryDetailBean.Stee
                 }
             }
         });
-        helper.setText(R.id.tv_name, item.getSteelmakingFurnaceCode());
+        helper.setText(R.id.tv_name, "炼钢厂");
         helper.setText(R.id.tv_content1, item.getType());
         helper.setText(R.id.tv_content2, item.getCapacity());
     }

app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3AddAdapter.java

@@ -38,28 +38,11 @@ public class UserDataAdd3AddAdapter extends BaseQuickAdapter<FactoryDetailBean.S
             }
         });
         helper.addOnClickListener(R.id.tv_delete);
-        helper.setText(R.id.et_name, item.getSteelmakingFurnaceCode());
+        helper.setText(R.id.et_name, "炼钢炉");
         helper.setText(R.id.et_content1, item.getType());
         helper.setText(R.id.et_content2, item.getCapacity());
-        EditText etName = helper.getView(R.id.et_name);
         EditText etContent1 = helper.getView(R.id.et_content1);
         EditText etContent2 = helper.getView(R.id.et_content2);
-        etName.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                item.setSteelmakingFurnaceCode(s.toString());
-            }
-        });
         etContent1.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {

app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3LabelAdapter.java

@@ -37,7 +37,7 @@ public class UserDataAdd3LabelAdapter extends BaseQuickAdapter<FactoryDetailBean
             }
         });
 
-        helper.setText(R.id.tv_name, item.getLadleCode());
+        helper.setText(R.id.tv_name, "钢包");
         helper.setText(R.id.tv_content1, item.getCapacity());
         helper.setText(R.id.tv_content2, item.getTemperatureRange());
         helper.setText(R.id.tv_content3, TimeUtils.millis2String(item.getCastingDateTime()*1000));

app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3LabelAddAdapter.java

@@ -42,32 +42,15 @@ public class UserDataAdd3LabelAddAdapter extends BaseQuickAdapter<FactoryDetailB
         });
         helper.addOnClickListener(R.id.rl_time);
         helper.addOnClickListener(R.id.tv_delete);
-        helper.setText(R.id.et_name, item.getLadleCode());
+        helper.setText(R.id.et_name, "钢包");
         helper.setText(R.id.et_content1, item.getCapacity());
         helper.setText(R.id.et_content2, item.getTemperatureRange());
         if (item.getCastingDateTime() != null) {
             helper.setText(R.id.et_content3, TimeUtils.millis2String(item.getCastingDateTime()*1000,new SimpleDateFormat("yyyy-MM-dd")));
         }
-        EditText etName = helper.getView(R.id.et_name);
         EditText etContent1 = helper.getView(R.id.et_content1);
         EditText etContent2 = helper.getView(R.id.et_content2);
         EditText etContent3 = helper.getView(R.id.et_content3);
-        etName.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                item.setLadleCode(s.toString());
-            }
-        });
         etContent1.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {

app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3RefAdapter.java

@@ -10,6 +10,8 @@ import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
 
 import java.util.List;
 
+import flexible.xd.android_base.utils.TimeUtils;
+
 /**
  * Created by flexible on 2018/8/13.
  */
@@ -37,9 +39,10 @@ public class UserDataAdd3RefAdapter extends BaseQuickAdapter<FactoryDetailBean.S
         helper.setText(R.id.tv_desc1, "型号和台数");
         helper.setText(R.id.tv_desc2, "钙处理方式");
 
-        helper.setText(R.id.tv_name, item.getRefiningFurnaceCode());
+        helper.setText(R.id.tv_name, "精炼炉");
         helper.setText(R.id.tv_content1, item.getModelNumber());
         helper.setText(R.id.tv_content2, item.getCalciumTreatmentSituation());
+
     }
 }
 

app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3RefAddAdapter.java

@@ -41,28 +41,12 @@ public class UserDataAdd3RefAddAdapter extends BaseQuickAdapter<FactoryDetailBea
         helper.setText(R.id.tv_desc2, "钙处理方式");
 
         helper.addOnClickListener(R.id.tv_delete);
-        helper.setText(R.id.et_name, item.getRefiningFurnaceCode());
+        helper.setText(R.id.et_name, "精炼炉");
         helper.setText(R.id.et_content1, item.getModelNumber());
         helper.setText(R.id.et_content2, item.getCalciumTreatmentSituation());
-        EditText etName = helper.getView(R.id.et_name);
+        helper.setText(R.id.et_content2, item.getCalciumTreatmentSituation());
         EditText etContent1 = helper.getView(R.id.et_content1);
         EditText etContent2 = helper.getView(R.id.et_content2);
-        etName.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                item.setRefiningFurnaceCode(s.toString());
-            }
-        });
         etContent1.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {

app/src/main/res/layout/activity_mes_user_data_machine_modify.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="match_parent"
+    android:orientation="vertical">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/ll_bottom">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+
+
+
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="连铸机"
+                    android:textSize="18sp" />
+
+
+            </RelativeLayout>
+            <RelativeLayout
+                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" />
+
+
+                <EditText
+                    android:id="@+id/tv_machine_name"
+                    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>
+
+            <View style="@style/dividerX" />
+            <RelativeLayout
+                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" />
+
+
+                <EditText
+                    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:textSize="14sp" />
+
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                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" />
+
+
+                <EditText
+                    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:textSize="14sp" />
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                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" />
+
+                <EditText
+                    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:textSize="14sp" />
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                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" />
+
+                <EditText
+                    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: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" />
+
+
+                    <EditText
+                        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" />
+
+
+                    <EditText
+                        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:visibility="gone"
+                    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" />
+
+
+                    <EditText
+                        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" />
+
+
+                    <EditText
+                        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" />
+
+
+                    <EditText
+                        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" />
+
+
+                    <EditText
+                        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" />
+
+
+                    <EditText
+                        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" />
+
+
+                    <EditText
+                        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"
+                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_cover"
+                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" />
+
+
+                    <EditText
+                        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: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" />
+
+
+                    <EditText
+                        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: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" />
+
+
+                    <EditText
+                        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:textSize="14sp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/rl_cover4"
+                    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_cover4"
+                        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_protection"
+                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_protection"
+                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" />
+
+
+                    <EditText
+                        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: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" />
+
+
+                    <EditText
+                        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: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" />
+
+
+                    <EditText
+                        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:textSize="14sp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/rl_protection4"
+                    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_protection4"
+                        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>
+
+            <RelativeLayout
+                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="15sp" />
+
+                <LinearLayout
+                    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_data1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <TextView
+                        android:id="@+id/tv_add1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="right"
+                        android:text="添加 +"
+                        android:textSize="16sp" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10mm"
+                android:background="@android:color/white"
+                android:gravity="right"
+                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="15sp" />
+                <LinearLayout
+                    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_data2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <TextView
+                        android:id="@+id/tv_add2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="right"
+                        android:text="添加 +"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
+            </RelativeLayout>
+
+
+            <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">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:text="其他供应商供货情况"
+                    android:textSize="15sp" />
+
+                <LinearLayout
+                    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"
+                        android:layout_gravity="right" />
+
+
+                    <TextView
+                        android:id="@+id/tv_add3"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="right"
+                        android:text="添加 +"
+                        android:textSize="16sp" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <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">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:text="库存记录"
+                    android:textSize="15sp" />
+
+                <LinearLayout
+                    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_data5"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <TextView
+                        android:id="@+id/tv_add5"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="right"
+                        android:text="添加 +"
+                        android:textSize="16sp" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <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">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:text="其他中包耐材记录"
+                    android:textSize="15sp" />
+
+                <LinearLayout
+                    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_data4"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <TextView
+                        android:id="@+id/tv_add4"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="right"
+                        android:text="添加 +"
+                        android:textSize="16sp" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <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">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:text="中间包承包与结算情况"
+                    android:textSize="15sp" />
+
+                <LinearLayout
+                    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_data6"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <TextView
+                        android:id="@+id/tv_add6"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="right"
+                        android:text="添加 +"
+                        android:textSize="16sp" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/rl_add"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10mm"
+                android:layout_marginBottom="30mm"
+                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" />
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="3mm"
+                    android:text="+添加"
+                    android:textSize="14sp" />
+            </RelativeLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</RelativeLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/ll_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@color/white"
+        android:gravity="center"
+        android:visibility="gone"
+        android:paddingVertical="10mm"
+     >
+
+        <Button
+            android:id="@+id/btn_refuse"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_red_circle"
+            android:paddingHorizontal="40mm"
+            android:text="驳回"
+            android:textColor="@color/white" />
+
+        <Button
+            android:id="@+id/btn_agree"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20mm"
+            android:background="@drawable/shape_blue_circle"
+            android:paddingHorizontal="40mm"
+            android:text="通过"
+            android:textColor="@color/white" />
+    </LinearLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/ll_bottom">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+
+
+
+            <RelativeLayout
+                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" />
+
+
+                <EditText
+                    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:textSize="14sp" />
+
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                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" />
+
+
+                <EditText
+                    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:textSize="14sp" />
+
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                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" />
+
+
+                <EditText
+                    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:textSize="14sp" />
+
+            </RelativeLayout>
+
+
+            <View style="@style/dividerX" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                android:orientation="horizontal"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:id="@+id/tv_factory_desc1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="炼钢炉"
+                    android:textSize="15sp" />
+
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_factory_data1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+
+            <View style="@style/dividerX" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                android:orientation="horizontal"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:id="@+id/tv_factory_desc2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="精炼炉"
+                    android:textSize="15sp" />
+
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_factory_data2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
+            <View style="@style/dividerX" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                android:orientation="vertical"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:id="@+id/tv_factory_desc3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="钢包"
+                    android:textSize="15sp" />
+
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_factory_data3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</RelativeLayout>
\ No newline at end of file

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

@@ -13,7 +13,7 @@
         android:paddingHorizontal="20mm"
         android:paddingVertical="9mm">
 
-        <EditText
+        <TextView
             android:id="@+id/et_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -14,7 +14,7 @@
         android:paddingVertical="9mm">
 
 
-        <EditText
+        <TextView
             android:id="@+id/et_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

app/src/main/res/menu/menu_machine_finish.xml

+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/modify"
+        android:title="编辑"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/finish"
+        android:title="完成"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file