1.编辑

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

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

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

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

@@ -142,7 +142,6 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
                     userDataBean.setSalesManagerName(chooseClient.getSalesManagerName());
                     startActivity(MesUserDataAdd2Activity.class, "data", JSON.toJSONString(userDataBean));
                 }
-
             }
         });
     }

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

@@ -19,6 +19,7 @@ import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.AccountBean;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
+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;
@@ -28,6 +29,8 @@ import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.UserDataAdd3Adapter;
 import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter;
 import com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter;
+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;
 
@@ -173,7 +176,6 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
     RecyclerView rvData6;
     @BindView(R.id.tv_add6)
     TextView tvAdd6;
-    private AccountBean dataBean;
     private UserDataMachineAdapter data1Adapter;
     private UserDataMachineAdapter data2Adapter;
     private UserDataMachineAdapter data3Adapter;
@@ -186,8 +188,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
     private List<FactoryDetailBean.SteelFurnListBean> dataFactory1List;
     private List<FactoryDetailBean.SteelRefFurnListBean> dataFactory2List;
     private List<FactoryDetailBean.SteelLadleListBean> dataFactory3List;
-    private UserDataAdd3Adapter factory1Adapter;
-    private UserDataAdd3RefAdapter factory2Adapter;
+    private UserDataDetailFactory1Adapter factory1Adapter;
+    private UserDataDetailFactory2Adapter factory2Adapter;
     private UserDataAdd3LabelAdapter factory3Adapter;
     private UserDataMachineAdapter data5Adapter;
     private UserDataMachineAdapter data6Adapter;
@@ -241,8 +243,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
         dataFactory1List = new ArrayList<>();
         dataFactory2List = new ArrayList<>();
         dataFactory3List = new ArrayList<>();
-        factory1Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3, dataFactory1List);
-        factory2Adapter = new UserDataAdd3RefAdapter(R.layout.item_user_add3, 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.bindToRecyclerView(rvFactoryData1);
         factory2Adapter.bindToRecyclerView(rvFactoryData2);
@@ -638,8 +640,12 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
         EventBus.getDefault().unregister(this);
     }
 
+//    @Subscribe
+//    public void refresh(RefreshMachineEvent event) {
+//        getData();
+//    }
     @Subscribe
-    public void refresh(RefreshMachineEvent event) {
+    public void refresh(ModifyUserDataEvent event) {
         getData();
     }
 

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

+package com.wd.workoffice.ui.adapter;
+
+
+import android.view.View;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class UserDataDetailFactory1Adapter extends BaseQuickAdapter<FactoryDetailBean.SteelFurnListBean, BaseViewHolder> {
+
+    public UserDataDetailFactory1Adapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, FactoryDetailBean.SteelFurnListBean item) {
+        helper.setText(R.id.tv_name, item.getSteelmakingFurnaceCode());
+        helper.setText(R.id.tv_num, item.getCapacity());
+
+    }
+}
+

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

+package com.wd.workoffice.ui.adapter;
+
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class UserDataDetailFactory2Adapter extends BaseQuickAdapter<FactoryDetailBean.SteelRefFurnListBean, BaseViewHolder> {
+
+    public UserDataDetailFactory2Adapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, FactoryDetailBean.SteelRefFurnListBean item) {
+        helper.setText(R.id.tv_name, item.getRefiningFurnaceCode());
+        helper.setText(R.id.tv_num, item.getModelNumber());
+        helper.setText(R.id.tv_type, item.getCalciumTreatmentSituation());
+    }
+}
+

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

@@ -288,7 +288,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@android:color/white"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:paddingHorizontal="20mm"
                 android:paddingVertical="9mm">
 
@@ -302,7 +302,7 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_factory_data1"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
@@ -313,7 +313,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@android:color/white"
-                android:orientation="vertical"
+                android:orientation="horizontal"
                 android:paddingHorizontal="20mm"
                 android:paddingVertical="9mm">
 
@@ -327,7 +327,7 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_factory_data2"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
 

app/src/main/res/layout/item_user_detail_factory1.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="wrap_content"
+    android:background="@android:color/white"
+    android:gravity="right"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="10mm"
+        android:text="cs344"
+        android:textSize="15sp" />
+
+    <TextView
+        android:id="@+id/tv_num"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="cs344"
+        android:textSize="15sp" />
+</LinearLayout>
\ No newline at end of file

app/src/main/res/layout/item_user_detail_factory2.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="wrap_content"
+    android:background="@android:color/white"
+    android:gravity="right"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/tv_num"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="10mm"
+        android:text="cs344"
+        android:textSize="15sp" />
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="10mm"
+        android:text="cs344"
+        android:textSize="15sp" />
+    <TextView
+        android:id="@+id/tv_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="cs344"
+        android:textSize="15sp" />
+</LinearLayout>
\ No newline at end of file