1.统一新增

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

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

@@ -17,6 +17,7 @@ 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.AddMachineEvent;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
 import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
@@ -29,6 +30,7 @@ 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;
@@ -152,8 +154,8 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_add1:
-                FactoryDetailBean.SteelFurnListBean data = new FactoryDetailBean.SteelFurnListBean();
-                data1List.add(data);
+                FactoryDetailBean.SteelFurnListBean data1 = new FactoryDetailBean.SteelFurnListBean();
+                data1List.add(data1);
                 data1Adapter.notifyDataSetChanged();
                 break;
             case R.id.tv_add2:
@@ -167,7 +169,12 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
                 data3Adapter.notifyDataSetChanged();
                 break;
             case R.id.rl_factory:
-                EventBus.getDefault().post(new AddFactoryEvent());
+                if (!checkParam()) {
+                    return;
+                }
+                Map<String, Object> param = getParam();
+                startActivity(MesChooseMachineAddActivity.class,"from","1"
+                ,"data",JSON.toJSONString(data),"factory",JSON.toJSONString(param));
                 break;
         }
     }
@@ -270,5 +277,20 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
         }
         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/MesChooseMachineAddActivity.java

 package com.wd.workoffice.ui.activity.mes.user;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -42,6 +43,8 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import flexible.xd.android_base.utils.ConvertUtils;
+import flexible.xd.android_base.utils.ObjectUtils;
 import flexible.xd.android_base.utils.TimeUtils;
 import io.reactivex.disposables.Disposable;
 import okhttp3.MediaType;
@@ -495,7 +498,12 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
         switch (item.getItemId()) {
             case R.id.finish:
                 changeSimple();
-                submitMachine();
+                if (TextUtils.equals("1",getIntent().getStringExtra("from"))){// 1 多步骤新增
+                    submitAll();
+                }else {
+                    submitMachine();
+                }
+
                 break;
         }
         return super.onOptionsItemSelected(item);
@@ -511,6 +519,14 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
 //        steelInfo.put("ladleCode", data.getSteelmakingWorksCode());
         steelInfo.put("continuousCasterCode", data.getContinuousCasterCode());
         param.put("steelInfo", steelInfo);
+        Map<String,Object> factoryMap = JSON.parseObject(getIntent().getStringExtra("factory"), Map.class);
+        Map<String,Object> machineMap =JSON.parseObject(JSON.toJSONString(machineDetailBean),Map.class);
+        for (Map.Entry<String, Object> factoryEntry : factoryMap.entrySet()) {
+            param.put(factoryEntry.getKey(), factoryEntry.getValue());
+        }
+        for (Map.Entry<String, Object> machineEntry : machineMap.entrySet()) {
+            param.put(machineEntry.getKey(), machineEntry.getValue());
+        }
         showLoading();
         RtfUtils.getMesRtf().userDataAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override