1.新增连铸机

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

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

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

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -229,6 +229,15 @@ public interface MesApiService {
     @POST("/himes/api/msSceneFeedback/save.json")
     Observable<BaseMesBean> userDataAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
+    /**
+     * otherSupplierAdd
+     *
+     * @return
+     */
+    @POST("/himes/api/msContinuousCasterInfo/save.json")
+    Observable<BaseMesBean> machineAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
+
+
     /**
      * otherSupplierAdd
      *

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

@@ -15,6 +15,7 @@ import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.ClientBean;
 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.FactoryBean;
 import com.wd.workoffice.bean.mesBean.MachineBean;
@@ -63,6 +64,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
     protected void initView() {
         ButterKnife.bind(this);
         rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        etKey.setHint("搜索连铸机");
     }
 
     @Override
@@ -159,7 +161,8 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
     }
 
     @Subscribe
-    public void refresh(AddFactoryEvent event) {
+    public void refresh(AddMachineEvent event) {
+        getData();
     }
 
 

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

@@ -18,6 +18,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.AddMachineAddChildEvent;
+import com.wd.workoffice.bean.event.AddMachineEvent;
 import com.wd.workoffice.bean.event.AddMachineModifyChildEvent;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
 import com.wd.workoffice.bean.event.RefreshMachineEvent;
@@ -41,7 +42,10 @@ 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;
 
 /**
  * 用户数据采集，添加
@@ -229,6 +233,56 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
         return R.layout.activity_mes_user_data_machine_add;
     }
 
+    private void  changeSimple(){
+        MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
+        if (castInfo == null) {
+            castInfo =new MachineDetailBean.CastInfoBean();
+            machineDetailBean.setCastInfo(castInfo);
+        }
+        castInfo.setContinuousCasterType(tvMachineType.getText().toString());
+        castInfo.setFractureSurface(tvSection.getText().toString());
+        castInfo.setSteelGrade(tvSteelType.getText().toString());
+        castInfo.setCastingSpeed(tvSpeed.getText().toString());
+        castInfo.setContinuousCasterCode(data.getContinuousCasterCode());
+        castInfo.setContinuousCasterName(data.getContinuousCasterName());
+        castInfo.setSteelmakingWorksCode(data.getSteelmakingWorksCode());
+        castInfo.setSteelmakingWorksName(data.getSteelmakingWorksName());
+
+        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());
+        castLadle.setBakingDateTime(TimeUtils.string2Millis(tvMiddle8.getText().toString())/1000);
+
+        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 changeList() {
         data1List.clear();
         data2List.clear();
@@ -440,13 +494,14 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.finish:
-                submit();
+                changeSimple();
+                submitMachine();
                 break;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    private void submit() {
+    private void submitAll() {
         Map<String, Object> param = WorkUtils.simpleParam();
         param.put("mainInfo", data);
         JSONObject steelInfo = new JSONObject();
@@ -482,10 +537,33 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
         });
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
+    private void submitMachine() {
+//        Map<String, Object> param = WorkUtils.simpleParam();
+//        param.put("steelInfo", steelInfo);
+        showLoading();
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), JSON.toJSONString(machineDetailBean));
+        RtfUtils.getMesRtf().machineAdd("1", "1", 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.getMsg());
+                    return;
+                }
+                toast("添加成功");
+                EventBus.getDefault().post(new AddMachineEvent());
+                finish();
+            }
+        });
     }
 }

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

@@ -197,7 +197,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
                 machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
                 MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
                 if (castInfo != null) {
-                    tvMachineType.setText(castInfo.getContinuousCasterName());
+                    tvMachineType.setText(castInfo.getContinuousCasterType());
                     tvSection.setText(castInfo.getFractureSurface());
                     tvSteelType.setText(castInfo.getSteelGrade());
                     tvSpeed.setText(castInfo.getCastingSpeed());
@@ -211,7 +211,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
                     tvMiddle5.setText(castLadle.getLiquidSteelTemperature());
                     tvMiddle6.setText(castLadle.getBakingMethod());
                     tvMiddle7.setText(castLadle.getBakingTemperature());
-                    tvMiddle8.setText(TimeUtils.millis2String(castLadle.getBakingDateTime()));
+                    tvMiddle8.setText(TimeUtils.millis2String(castLadle.getBakingDateTime()/1000));
                 }
                 MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
                 if (covAgent != null) {

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

@@ -163,18 +163,6 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
 //        return super.onOptionsItemSelected(item);
 //    }
 
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 10001 && resultCode == 10001) {
-            String clientName = data.getStringExtra("clientName");
-//            clientId = data.getIntExtra("id", 0);
-//            tvClient.setText(clientName);
-        }
-    }
-
-
     @OnClick(R.id.rl_machine)
     public void onViewClicked() {
         startActivity(MesChooseMachineActivity.class,"data",JSON.toJSONString(data));

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

@@ -21,7 +21,7 @@ public class UserDataChooseMachineAdapter extends BaseQuickAdapter<MachineBean,
 
     @Override
     protected void convert(BaseViewHolder helper, MachineBean item) {
-        helper.setText(R.id.tv_name,item.getContinuousCasterName());
+        helper.setText(R.id.tv_name,item.getContinuousCasterType());
     }
 }