1.详情页面编辑

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

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.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.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 
 import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -50,6 +52,8 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
     Button btnSearch;
     @BindView(R.id.rv_client)
     RecyclerView rvClient;
+    @BindView(R.id.ll_search)
+    LinearLayout llSearch;
     private Map<String, Object> param;
     private List<FactoryBean> clientList;
     private UserDataFactorytAdapter clientAdapter;
@@ -60,6 +64,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
     protected void initView() {
         ButterKnife.bind(this);
         rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        llSearch.setVisibility(View.GONE);
         etKey.setHint("请输入炼钢厂");
     }
 
@@ -178,4 +183,5 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
     public void finish(AddUserDataEvent event) {
         finish();
     }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineActivity.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.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 
 import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -50,14 +52,18 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
     Button btnSearch;
     @BindView(R.id.rv_client)
     RecyclerView rvClient;
+    @BindView(R.id.ll_search)
+    LinearLayout llSearch;
     private Map<String, Object> param;
     private List<MachineBean> clientList;
     private UserDataChooseMachineAdapter clientAdapter;
     private UserDataBean.ListBean data;
     private Map<String, Object> paramMap;
+
     @Override
     protected void initView() {
         ButterKnife.bind(this);
+        llSearch.setVisibility(View.GONE);
         rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         etKey.setHint("搜索连铸机");
     }
@@ -175,4 +181,5 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
     public void finish(AddUserDataEvent event) {
         finish();
     }
+
 }

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

@@ -24,7 +24,12 @@ import com.wd.workoffice.bean.mesBean.MachineDetailBean;
 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.UserDataAdd3Adapter;
+import com.wd.workoffice.ui.adapter.UserDataAdd3AddAdapter;
 import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter;
+import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAddAdapter;
+import com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter;
+import com.wd.workoffice.ui.adapter.UserDataAdd3RefAddAdapter;
 import com.wd.workoffice.ui.adapter.UserDataDetailFactory1Adapter;
 import com.wd.workoffice.ui.adapter.UserDataDetailFactory2Adapter;
 import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
@@ -188,15 +193,17 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
     private List<FactoryDetailBean.SteelFurnListBean> dataFactory1List;
     private List<FactoryDetailBean.SteelRefFurnListBean> dataFactory2List;
     private List<FactoryDetailBean.SteelLadleListBean> dataFactory3List;
-    private UserDataDetailFactory1Adapter factory1Adapter;
-    private UserDataDetailFactory2Adapter factory2Adapter;
+    private UserDataAdd3Adapter factory1Adapter;
+    private UserDataAdd3RefAdapter factory2Adapter;
     private UserDataAdd3LabelAdapter factory3Adapter;
+
     private UserDataMachineAdapter data5Adapter;
     private UserDataMachineAdapter data6Adapter;
     private List<String> data5List;
     private List<String> data6List;
     private UserDataDetailBean userDataDetailBean;
 
+
     @Override
     protected void initView() {
         ButterKnife.bind(this);
@@ -244,9 +251,13 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
         dataFactory1List = new ArrayList<>();
         dataFactory2List = new ArrayList<>();
         dataFactory3List = new ArrayList<>();
-        factory1Adapter = new UserDataDetailFactory1Adapter(R.layout.item_user_detail_factory1, dataFactory1List);
-        factory2Adapter = new UserDataDetailFactory2Adapter(R.layout.item_user_detail_factory2, dataFactory2List);
+//        factory1Adapter = new UserDataDetailFactory1Adapter(R.layout.item_user_detail_factory1, dataFactory1List);
+//        factory2Adapter = new UserDataDetailFactory2Adapter(R.layout.item_user_detail_factory2, dataFactory2List);
+//        factory3Adapter = new UserDataAdd3LabelAdapter(R.layout.item_add3_label, dataFactory3List);
+        factory1Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3, dataFactory1List);
+        factory2Adapter = new UserDataAdd3RefAdapter(R.layout.item_user_add3, dataFactory2List);
         factory3Adapter = new UserDataAdd3LabelAdapter(R.layout.item_add3_label, dataFactory3List);
+
         factory1Adapter.bindToRecyclerView(rvFactoryData1);
         factory2Adapter.bindToRecyclerView(rvFactoryData2);
         factory3Adapter.bindToRecyclerView(rvFactoryData3);
@@ -618,10 +629,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (!TextUtils.equals("1", getIntent().getStringExtra("from"))) {
-            if (TextUtils.equals("2", getIntent().getStringExtra("status"))) {
-                getMenuInflater().inflate(R.menu.menu_modify, menu);
-            }
+        if (TextUtils.equals("2", getIntent().getStringExtra("status"))) {
+            getMenuInflater().inflate(R.menu.menu_modify, menu);
         }
         return super.onCreateOptionsMenu(menu);
     }
@@ -633,7 +642,6 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
                 startActivity(MesUserDataDetailModifyActivity.class, "from", getIntent().getStringExtra("from"),
                         "id", getIntent().getStringExtra("id"), "status",
                         getIntent().getStringExtra("status"));
-                finish();
                 break;
         }
         return super.onOptionsItemSelected(item);

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

@@ -134,8 +134,8 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                boolean isJob = TextUtils.equals(UserKeeper.getInstance().getMesUid(), dataList.get(position).getApprovalUserId());
-                startActivity(MesUserDataDetailActivity.class,"from",isJob ? "1" : "0","id",
+//                boolean isJob = TextUtils.equals(UserKeeper.getInstance().getMesUid(), dataList.get(position).getApprovalUserId());
+                startActivity(MesUserDataDetailActivity.class,"from","1","id",
                         dataList.get(position).getId(),"status",
                         dataList.get(position).getApprovalStatus()+"");
             }

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

@@ -36,7 +36,7 @@ public class MesUserDataAdapter extends BaseQuickAdapter<UserDataBean.ListBean,
             switch (item.getApprovalStatus()) {
                 case 0:
                     helper.setTextColor(R.id.tv_status, Color.parseColor("#FF6AA3D4"));
-                    helper.setText(R.id.tv_status, "已提交");
+                    helper.setText(R.id.tv_status, "未审核");
                     break;
                 case 1:
                     helper.setTextColor(R.id.tv_status, Color.parseColor("#FF349A85"));
@@ -44,11 +44,17 @@ public class MesUserDataAdapter extends BaseQuickAdapter<UserDataBean.ListBean,
                     break;
                 case 2:
                     helper.setTextColor(R.id.tv_status, Color.parseColor("#FFB84D4D"));
-                    helper.setText(R.id.tv_status, "驳回");
+                    helper.setText(R.id.tv_status, "已驳回");
+                    break;
+                default:
+                    helper.setTextColor(R.id.tv_status, Color.parseColor("#FF6AA3D4"));
+                    helper.setText(R.id.tv_status, "未审核");
                     break;
             }
+        }else {
+            helper.setTextColor(R.id.tv_status, Color.parseColor("#FF6AA3D4"));
+            helper.setText(R.id.tv_status, "未审核");
         }
-
     }
 }
 

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

@@ -10,6 +10,7 @@
 
 
         <LinearLayout
+            android:id="@+id/ll_search"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"

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

@@ -297,6 +297,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="炼钢炉"
+                    android:visibility="gone"
                     android:textSize="15sp" />
 
 
@@ -322,6 +323,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="精炼炉"
+                    android:visibility="gone"
                     android:textSize="15sp" />
 
 
@@ -346,6 +348,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="钢包"
+                    android:visibility="gone"
                     android:textSize="15sp" />
 
 

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

@@ -299,6 +299,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="炼钢炉"
+                    android:visibility="gone"
                     android:textSize="15sp" />
 
 
@@ -308,7 +309,16 @@
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
-
+            <TextView
+                android:id="@+id/tv_factory_add1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                android:gravity="center"
+                android:paddingVertical="15mm"
+                android:text="+添加炼钢炉"
+                android:textColor="@color/blue_btn"
+                android:textSize="15sp" />
             <View style="@style/dividerX" />
 
             <LinearLayout
@@ -324,6 +334,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="精炼炉"
+                    android:visibility="gone"
                     android:textSize="15sp" />
 
 
@@ -332,7 +343,16 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
-
+            <TextView
+                android:id="@+id/tv_factory_add2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                android:gravity="center"
+                android:paddingVertical="15mm"
+                android:text="+添加精炼炉"
+                android:textColor="@color/blue_btn"
+                android:textSize="15sp" />
             <View style="@style/dividerX" />
 
             <LinearLayout
@@ -348,6 +368,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="钢包"
+                    android:visibility="gone"
                     android:textSize="15sp" />
 
 
@@ -356,7 +377,16 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
             </LinearLayout>
-
+            <TextView
+                android:id="@+id/tv_factory_add3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                android:gravity="center"
+                android:paddingVertical="15mm"
+                android:text="+添加钢包"
+                android:textColor="@color/blue_btn"
+                android:textSize="15sp" />
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

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_add_factory_label.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <RelativeLayout