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/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/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_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