Skip to content

W
workoffice
提交 0e20943b authored 作者: lgd's avatar lgd
浏览文件
操作

1.用户选择添加新增预览 

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.支数参数
上级 b589c303
显示空白字符变更
内嵌 并排
正在显示 包含 1345 行增加 和 141 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 0e20943b
......@@ -1857,6 +1857,14 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesUserDataDetailAddActivity"
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"
......
app/src/main/java/com/wd/workoffice/bean/mesBean/UserDataDetailBean.java
浏览文件 @ 0e20943b
package com.wd.workoffice.bean.mesBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
......@@ -29,178 +31,177 @@ public class UserDataDetailBean {
* settleList : null
* delete : null
*/
private MachineDetailBean.CastInfoBean castInfo;
private MachineDetailBean.CastLadleBean castLadle;
private MachineDetailBean.CovAgentBean covAgent;
private MachineDetailBean.MouldFluBean mouldFlu;
private List<MachineDetailBean.ProductListBean> productList;
private List<MachineDetailBean.SupplyListBean> supplyList;
private List<MachineDetailBean.StockListBean> stockList;
private List<MachineDetailBean.OtherSupListBean> otherSupList;
private List<MachineDetailBean.OtherLadleListBean> otherLadleList;
private List<MachineDetailBean.SettleListBean> settleList;
private Object id;
private Object createDateTime;
private Object updateDateTime;
private MainInfoBean mainInfo;
private SteelInfoBean steelInfo;
private Object steelWorks;
private Object steelFurnList;
private Object steelRefFurnList;
private Object steelLadleList;
private Object castInfo;
private Object castLadle;
private Object covAgent;
private Object mouldFlu;
private Object productList;
private Object supplyList;
private Object stockList;
private Object otherSupList;
private Object otherLadleList;
private Object settleList;
private FactoryDetailBean.SteelWorksBean steelWorks;
private List<FactoryDetailBean.SteelFurnListBean> steelFurnList;
private List<FactoryDetailBean.SteelRefFurnListBean> steelRefFurnList;
private List<FactoryDetailBean.SteelLadleListBean> steelLadleList;
private Object delete;
public Object getId() {
return id;
public MachineDetailBean.CastInfoBean getCastInfo() {
return castInfo;
}
public void setId(Object id) {
this.id = id;
public void setCastInfo(MachineDetailBean.CastInfoBean castInfo) {
this.castInfo = castInfo;
}
public Object getCreateDateTime() {
return createDateTime;
public MachineDetailBean.CastLadleBean getCastLadle() {
return castLadle;
}
public void setCreateDateTime(Object createDateTime) {
this.createDateTime = createDateTime;
public void setCastLadle(MachineDetailBean.CastLadleBean castLadle) {
this.castLadle = castLadle;
}
public Object getUpdateDateTime() {
return updateDateTime;
public MachineDetailBean.CovAgentBean getCovAgent() {
return covAgent;
}
public void setUpdateDateTime(Object updateDateTime) {
this.updateDateTime = updateDateTime;
public void setCovAgent(MachineDetailBean.CovAgentBean covAgent) {
this.covAgent = covAgent;
}
public MainInfoBean getMainInfo() {
return mainInfo;
public MachineDetailBean.MouldFluBean getMouldFlu() {
return mouldFlu;
}
public void setMainInfo(MainInfoBean mainInfo) {
this.mainInfo = mainInfo;
public void setMouldFlu(MachineDetailBean.MouldFluBean mouldFlu) {
this.mouldFlu = mouldFlu;
}
public SteelInfoBean getSteelInfo() {
return steelInfo;
public List<MachineDetailBean.ProductListBean> getProductList() {
return productList;
}
public void setSteelInfo(SteelInfoBean steelInfo) {
this.steelInfo = steelInfo;
public void setProductList(List<MachineDetailBean.ProductListBean> productList) {
this.productList = productList;
}
public Object getSteelWorks() {
return steelWorks;
public List<MachineDetailBean.SupplyListBean> getSupplyList() {
return supplyList;
}
public void setSteelWorks(Object steelWorks) {
this.steelWorks = steelWorks;
public void setSupplyList(List<MachineDetailBean.SupplyListBean> supplyList) {
this.supplyList = supplyList;
}
public Object getSteelFurnList() {
return steelFurnList;
public List<MachineDetailBean.StockListBean> getStockList() {
return stockList;
}
public void setSteelFurnList(Object steelFurnList) {
this.steelFurnList = steelFurnList;
public void setStockList(List<MachineDetailBean.StockListBean> stockList) {
this.stockList = stockList;
}
public Object getSteelRefFurnList() {
return steelRefFurnList;
public List<MachineDetailBean.OtherSupListBean> getOtherSupList() {
return otherSupList;
}
public void setSteelRefFurnList(Object steelRefFurnList) {
this.steelRefFurnList = steelRefFurnList;
public void setOtherSupList(List<MachineDetailBean.OtherSupListBean> otherSupList) {
this.otherSupList = otherSupList;
}
public Object getSteelLadleList() {
return steelLadleList;
public List<MachineDetailBean.OtherLadleListBean> getOtherLadleList() {
return otherLadleList;
}
public void setSteelLadleList(Object steelLadleList) {
this.steelLadleList = steelLadleList;
public void setOtherLadleList(List<MachineDetailBean.OtherLadleListBean> otherLadleList) {
this.otherLadleList = otherLadleList;
}
public Object getCastInfo() {
return castInfo;
public List<MachineDetailBean.SettleListBean> getSettleList() {
return settleList;
}
public void setCastInfo(Object castInfo) {
this.castInfo = castInfo;
public void setSettleList(List<MachineDetailBean.SettleListBean> settleList) {
this.settleList = settleList;
}
public Object getCastLadle() {
return castLadle;
public Object getId() {
return id;
}
public void setCastLadle(Object castLadle) {
this.castLadle = castLadle;
public void setId(Object id) {
this.id = id;
}
public Object getCovAgent() {
return covAgent;
public Object getCreateDateTime() {
return createDateTime;
}
public void setCovAgent(Object covAgent) {
this.covAgent = covAgent;
public void setCreateDateTime(Object createDateTime) {
this.createDateTime = createDateTime;
}
public Object getMouldFlu() {
return mouldFlu;
public Object getUpdateDateTime() {
return updateDateTime;
}
public void setMouldFlu(Object mouldFlu) {
this.mouldFlu = mouldFlu;
public void setUpdateDateTime(Object updateDateTime) {
this.updateDateTime = updateDateTime;
}
public Object getProductList() {
return productList;
public MainInfoBean getMainInfo() {
return mainInfo;
}
public void setProductList(Object productList) {
this.productList = productList;
public void setMainInfo(MainInfoBean mainInfo) {
this.mainInfo = mainInfo;
}
public Object getSupplyList() {
return supplyList;
public SteelInfoBean getSteelInfo() {
return steelInfo;
}
public void setSupplyList(Object supplyList) {
this.supplyList = supplyList;
public void setSteelInfo(SteelInfoBean steelInfo) {
this.steelInfo = steelInfo;
}
public Object getStockList() {
return stockList;
public FactoryDetailBean.SteelWorksBean getSteelWorks() {
return steelWorks;
}
public void setStockList(Object stockList) {
this.stockList = stockList;
public void setSteelWorks(FactoryDetailBean.SteelWorksBean steelWorks) {
this.steelWorks = steelWorks;
}
public Object getOtherSupList() {
return otherSupList;
public List<FactoryDetailBean.SteelFurnListBean> getSteelFurnList() {
return steelFurnList;
}
public void setOtherSupList(Object otherSupList) {
this.otherSupList = otherSupList;
public void setSteelFurnList(List<FactoryDetailBean.SteelFurnListBean> steelFurnList) {
this.steelFurnList = steelFurnList;
}
public Object getOtherLadleList() {
return otherLadleList;
public List<FactoryDetailBean.SteelRefFurnListBean> getSteelRefFurnList() {
return steelRefFurnList;
}
public void setOtherLadleList(Object otherLadleList) {
this.otherLadleList = otherLadleList;
public void setSteelRefFurnList(List<FactoryDetailBean.SteelRefFurnListBean> steelRefFurnList) {
this.steelRefFurnList = steelRefFurnList;
}
public Object getSettleList() {
return settleList;
public List<FactoryDetailBean.SteelLadleListBean> getSteelLadleList() {
return steelLadleList;
}
public void setSettleList(Object settleList) {
this.settleList = settleList;
public void setSteelLadleList(List<FactoryDetailBean.SteelLadleListBean> steelLadleList) {
this.steelLadleList = steelLadleList;
}
public Object getDelete() {
......@@ -274,13 +275,22 @@ public class UserDataDetailBean {
private Object treeId;
private Object treeName;
private Object treeParentId;
private Object steelmakingWorksCode;
private Object steelmakingWorksName;
private String steelmakingWorksCode;
private String steelmakingWorksName;
private Object annualOutput;
private Object steelGrade;
private Object continuousCasterName;
private String continuousCasterName;
private Object continuousCasterType;
private Object delete;
private String continuousCasterCode;
public String getContinuousCasterCode() {
return continuousCasterCode;
}
public void setContinuousCasterCode(String continuousCasterCode) {
this.continuousCasterCode = continuousCasterCode;
}
public String getId() {
return id;
......@@ -490,19 +500,19 @@ public class UserDataDetailBean {
this.treeParentId = treeParentId;
}
public Object getSteelmakingWorksCode() {
public String getSteelmakingWorksCode() {
return steelmakingWorksCode;
}
public void setSteelmakingWorksCode(Object steelmakingWorksCode) {
public void setSteelmakingWorksCode(String steelmakingWorksCode) {
this.steelmakingWorksCode = steelmakingWorksCode;
}
public Object getSteelmakingWorksName() {
public String getSteelmakingWorksName() {
return steelmakingWorksName;
}
public void setSteelmakingWorksName(Object steelmakingWorksName) {
public void setSteelmakingWorksName(String steelmakingWorksName) {
this.steelmakingWorksName = steelmakingWorksName;
}
......@@ -522,11 +532,11 @@ public class UserDataDetailBean {
this.steelGrade = steelGrade;
}
public Object getContinuousCasterName() {
public String getContinuousCasterName() {
return continuousCasterName;
}
public void setContinuousCasterName(Object continuousCasterName) {
public void setContinuousCasterName(String continuousCasterName) {
this.continuousCasterName = continuousCasterName;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryAddActivity.java
浏览文件 @ 0e20943b
......@@ -245,7 +245,7 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
private boolean checkParam() {
boolean dataHasNull = false;
for (FactoryDetailBean.SteelFurnListBean steelFurnListBean : data1List) {
if (TextUtils.isEmpty(steelFurnListBean.getCapacity()) || TextUtils.isEmpty(steelFurnListBean.getSteelmakingFurnaceCode())
if (TextUtils.isEmpty(steelFurnListBean.getCapacity())
|| TextUtils.isEmpty(steelFurnListBean.getType())) {
dataHasNull = true;
}
......@@ -255,7 +255,7 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
return false;
}
for (FactoryDetailBean.SteelRefFurnListBean steelRefFurnListBean : data2List) {
if (TextUtils.isEmpty(steelRefFurnListBean.getRefiningFurnaceCode()) || TextUtils.isEmpty(steelRefFurnListBean.getModelNumber())
if ( TextUtils.isEmpty(steelRefFurnListBean.getModelNumber())
|| TextUtils.isEmpty(steelRefFurnListBean.getCalciumTreatmentSituation())) {
dataHasNull = true;
}
......@@ -266,7 +266,7 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
}
for (FactoryDetailBean.SteelLadleListBean steelLadleListBean : data3List) {
if (TextUtils.isEmpty(steelLadleListBean.getCapacity()) || steelLadleListBean.getCastingDateTime() == null
|| TextUtils.isEmpty(steelLadleListBean.getTemperatureRange()) || TextUtils.isEmpty(steelLadleListBean.getLadleCode())) {
|| TextUtils.isEmpty(steelLadleListBean.getTemperatureRange())) {
dataHasNull = true;
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java
浏览文件 @ 0e20943b
......@@ -256,8 +256,6 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
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());
......@@ -345,9 +343,11 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
}
}
@OnClick({R.id.tv_add2, R.id.rl_cover4, R.id.rl_protection4, R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
@OnClick({R.id.tv_next,R.id.tv_add2, R.id.rl_cover4, R.id.rl_protection4, R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_next:
break;
case R.id.rl_cover4:
startActivityForResult(MesChooseClientActivity.class,
10001, "from", "1");
......@@ -546,7 +546,6 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
} else {
submitMachine();
}
break;
}
return super.onOptionsItemSelected(item);
......@@ -570,30 +569,34 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
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
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.getMessage());
return;
}
toast("添加成功");
EventBus.getDefault().post(new AddUserDataEvent());
finish();
}
});
startActivity(MesUserDataDetailAddActivity.class,"from","1"
,"data",JSON.toJSONString(param));
// showLoading();
// RtfUtils.getMesRtf().userDataAdd("1", "1", WorkUtils.convertMapToBody(param)).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.getMessage());
// return;
// }
// toast("添加成功");
// EventBus.getDefault().post(new AddUserDataEvent());
// finish();
// }
// });
}
private void submitMachine() {
......@@ -656,4 +659,8 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
break;
}
}
@Subscribe
public void refresh(AddUserDataEvent event) {
finish();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java
浏览文件 @ 0e20943b
......@@ -200,6 +200,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
if (castInfo != null) {
tvMachineName.setText(castInfo.getContinuousCasterName());
tvMachineType.setText(castInfo.getContinuousCasterType());
tvSection.setText(castInfo.getFractureSurface());
tvSteelType.setText(castInfo.getSteelGrade());
......@@ -330,9 +331,19 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_add2, R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
@OnClick({R.id.tv_next,R.id.tv_add2, R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_next:
Map<String, Object> param = WorkUtils.simpleParam();
param.put("mainInfo", data);
JSONObject steelInfo = new JSONObject();
steelInfo.put("steelmakingWorksCode", data.getSteelmakingWorksCode());
steelInfo.put("continuousCasterCode", data.getContinuousCasterCode());
param.put("steelInfo", steelInfo);
startActivity(MesUserDataDetailAddActivity.class,"form","0"
,"data",JSON.toJSONString(param));
break;
case R.id.tv_add1:
startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break;
......@@ -395,19 +406,23 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
getData();
}
@Subscribe
public void refresh(AddUserDataEvent event) {
finish();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_machine_finish, menu);
getMenuInflater().inflate(R.menu.menu_modify, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
submit();
break;
// case R.id.finish:
// submit();
// break;
case R.id.modify:
startActivity(MesChooseMachineModifyActivity.class,
"data",JSON.toJSONString(data));
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ 0e20943b
......@@ -511,7 +511,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_add5, R.id.tv_add6, R.id.btn_agree, R.id.btn_refuse, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
@OnClick({R.id.tv_add5, R.id.tv_add6, R.id.btn_agree,
R.id.btn_refuse, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add,R.id.rl_middle,R.id.rl_cover,R.id.rl_protection})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_add1:
......@@ -567,6 +568,27 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
case R.id.btn_refuse:
openCheck(2);
break;
case R.id.rl_middle:
if (llMiddle.getVisibility() == View.VISIBLE) {
llMiddle.setVisibility(View.GONE);
} else {
llMiddle.setVisibility(View.VISIBLE);
}
break;
case R.id.rl_cover:
if (llCover.getVisibility() == View.VISIBLE) {
llCover.setVisibility(View.GONE);
} else {
llCover.setVisibility(View.VISIBLE);
}
break;
case R.id.rl_protection:
if (llProtection.getVisibility() == View.VISIBLE) {
llProtection.setVisibility(View.GONE);
} else {
llProtection.setVisibility(View.VISIBLE);
}
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailAddActivity.java 0 → 100644
浏览文件 @ 0e20943b
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
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.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddMachineAddChildEvent;
import com.wd.workoffice.bean.event.AddMachineModifyChildEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
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.UserDataAdd3AddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
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;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
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;
/**
* 用户数据采集，
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
@BindView(R.id.btn_refuse)
Button btnRefuse;
@BindView(R.id.btn_agree)
Button btnAgree;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.tv_reason)
TextView tvReason;
@BindView(R.id.ll_reason)
LinearLayout llReason;
@BindView(R.id.iv_modify_client)
ImageView ivModifyClient;
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
@BindView(R.id.tv_sale)
TextView tvSale;
@BindView(R.id.tv_manager)
TextView tvManager;
@BindView(R.id.iv_modify_steel)
ImageView ivModifySteel;
@BindView(R.id.tv_factory)
EditText tvFactory;
@BindView(R.id.tv_num)
EditText tvNum;
@BindView(R.id.tv_type)
EditText tvType;
@BindView(R.id.tv_factory_desc1)
TextView tvFactoryDesc1;
@BindView(R.id.rv_factory_data1)
RecyclerView rvFactoryData1;
@BindView(R.id.tv_factory_desc2)
TextView tvFactoryDesc2;
@BindView(R.id.rv_factory_data2)
RecyclerView rvFactoryData2;
@BindView(R.id.tv_factory_desc3)
TextView tvFactoryDesc3;
@BindView(R.id.rv_factory_data3)
RecyclerView rvFactoryData3;
@BindView(R.id.iv_modify_machine)
ImageView ivModifyMachine;
@BindView(R.id.tv_machine_type)
EditText tvMachineType;
@BindView(R.id.tv_section)
EditText tvSection;
@BindView(R.id.tv_steel_type)
EditText tvSteelType;
@BindView(R.id.tv_speed)
EditText tvSpeed;
@BindView(R.id.rl_middle)
RelativeLayout rlMiddle;
@BindView(R.id.tv_middle1)
EditText tvMiddle1;
@BindView(R.id.tv_middle2)
EditText tvMiddle2;
@BindView(R.id.tv_middle3)
EditText tvMiddle3;
@BindView(R.id.tv_middle4)
EditText tvMiddle4;
@BindView(R.id.tv_middle5)
EditText tvMiddle5;
@BindView(R.id.tv_middle6)
EditText tvMiddle6;
@BindView(R.id.tv_middle7)
EditText tvMiddle7;
@BindView(R.id.tv_middle8)
EditText tvMiddle8;
@BindView(R.id.ll_middle)
LinearLayout llMiddle;
@BindView(R.id.rl_cover)
RelativeLayout rlCover;
@BindView(R.id.tv_cover1)
EditText tvCover1;
@BindView(R.id.tv_cover2)
EditText tvCover2;
@BindView(R.id.tv_cover3)
EditText tvCover3;
@BindView(R.id.tv_cover4)
TextView tvCover4;
@BindView(R.id.rl_cover4)
RelativeLayout rlCover4;
@BindView(R.id.ll_cover)
LinearLayout llCover;
@BindView(R.id.rl_protection)
RelativeLayout rlProtection;
@BindView(R.id.tv_protection1)
EditText tvProtection1;
@BindView(R.id.tv_protection2)
EditText tvProtection2;
@BindView(R.id.tv_protection3)
EditText tvProtection3;
@BindView(R.id.tv_protection4)
TextView tvProtection4;
@BindView(R.id.rl_protection4)
RelativeLayout rlProtection4;
@BindView(R.id.ll_protection)
LinearLayout llProtection;
@BindView(R.id.rv_data1)
RecyclerView rvData1;
@BindView(R.id.tv_add1)
TextView tvAdd1;
@BindView(R.id.rv_data2)
RecyclerView rvData2;
@BindView(R.id.rv_data3)
RecyclerView rvData3;
@BindView(R.id.tv_add3)
TextView tvAdd3;
@BindView(R.id.rv_data5)
RecyclerView rvData5;
@BindView(R.id.tv_add5)
TextView tvAdd5;
@BindView(R.id.rv_data4)
RecyclerView rvData4;
@BindView(R.id.tv_add4)
TextView tvAdd4;
@BindView(R.id.rv_data6)
RecyclerView rvData6;
@BindView(R.id.tv_add6)
TextView tvAdd6;
@BindView(R.id.rl_add)
RelativeLayout rlAdd;
@BindView(R.id.tv_machine_name)
EditText tvMachineName;
@BindView(R.id.tv_add2)
TextView tvAdd2;
@BindView(R.id.tv_factory_add1)
TextView tvFactoryAdd1;
@BindView(R.id.tv_factory_add2)
TextView tvFactoryAdd2;
@BindView(R.id.tv_factory_add3)
TextView tvFactoryAdd3;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
private UserDataMachineAdapter data4Adapter;
private List<String> data1List;
private List<String> data2List;
private List<String> data3List;
private List<String> data4List;
private List<FactoryDetailBean.SteelFurnListBean> dataFactory1List;
private List<FactoryDetailBean.SteelRefFurnListBean> dataFactory2List;
private List<FactoryDetailBean.SteelLadleListBean> dataFactory3List;
private UserDataAdd3AddAdapter factory1Adapter;
private UserDataAdd3RefAddAdapter factory2Adapter;
private UserDataAdd3LabelAddAdapter factory3Adapter;
private UserDataMachineAdapter data5Adapter;
private UserDataMachineAdapter data6Adapter;
private List<String> data5List;
private List<String> data6List;
private UserDataDetailBean dataParam;
@Override
protected void initView() {
ButterKnife.bind(this);
// changeViewModify(1);
// changeViewModify(2);
rvData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
llReason.setVisibility(View.GONE);
llBottom.setVisibility(View.GONE);
}
@Override
protected void initData() {
dataParam = JSON.parseObject(getIntent().getStringExtra("data"), UserDataDetailBean.class);
data1List = new ArrayList<>();
data2List = new ArrayList<>();
data3List = new ArrayList<>();
data4List = new ArrayList<>();
data5List = new ArrayList<>();
data6List = new ArrayList<>();
data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List);
data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List);
data3Adapter = new UserDataMachineAdapter(R.layout.item_machine, data3List);
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
data6Adapter.bindToRecyclerView(rvData6);
dataFactory1List = new ArrayList<>();
dataFactory2List = new ArrayList<>();
dataFactory3List = new ArrayList<>();
factory1Adapter = new UserDataAdd3AddAdapter(R.layout.item_user_add3_add, dataFactory1List);
factory2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add, dataFactory2List);
factory3Adapter = new UserDataAdd3LabelAddAdapter(R.layout.item_user_add_factory_label, dataFactory3List);
factory1Adapter.bindToRecyclerView(rvFactoryData1);
factory2Adapter.bindToRecyclerView(rvFactoryData2);
factory3Adapter.bindToRecyclerView(rvFactoryData3);
changeInfo();
}
private void changeInfo() {
UserDataDetailBean.MainInfoBean mainInfo = dataParam.getMainInfo();
if (mainInfo != null) {
tvClient.setText(mainInfo.getCustomerUserName());
tvManager.setText(mainInfo.getSalesManagerName());
tvSale.setText(mainInfo.getSalesCompanyName());
tvReason.setText(mainInfo.getRemark());
}
if (!TextUtils.equals("1", getIntent().getStringExtra("from"))) {//不是多步新增，需获取数据
getMachineData(dataParam.getSteelInfo().getContinuousCasterCode());
getFactoryData(dataParam.getSteelInfo().getSteelmakingWorksCode());
}else {
changeFactoryInfo();
changeList();
}
}
private void getFactoryData(String code) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("steelmakingWorksCode", code);
RtfUtils.getMesRtf().factoryDetail("1", WorkUtils.convertMapToBody(param)).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.getMessage());
return;
}
FactoryDetailBean factoryDetailBean = JSON.parseObject(data.getData().toString(), FactoryDetailBean.class);
dataParam.setSteelWorks(factoryDetailBean.getSteelWorks());
dataParam.setSteelFurnList(factoryDetailBean.getSteelFurnList());
dataParam.setSteelRefFurnList(factoryDetailBean.getSteelRefFurnList());
dataParam.setSteelLadleList(factoryDetailBean.getSteelLadleList());
changeFactoryInfo();
}
});
}
private void changeFactoryInfo() {
FactoryDetailBean.SteelWorksBean steelWorks = dataParam.getSteelWorks();
if (steelWorks != null) {
tvNum.setText(steelWorks.getAnnualOutput());
tvFactory.setText(steelWorks.getSteelmakingWorksName());
tvType.setText(steelWorks.getSteelGrade());
}
if (dataParam.getSteelFurnList() != null) {
dataFactory1List.clear();
dataFactory1List.addAll(dataParam.getSteelFurnList());
factory1Adapter.notifyDataSetChanged();
}
if (dataParam.getSteelRefFurnList() != null) {
dataFactory2List.clear();
dataFactory2List.addAll(dataParam.getSteelRefFurnList());
factory2Adapter.notifyDataSetChanged();
}
if (dataParam.getSteelLadleList() != null) {
dataFactory3List.clear();
dataFactory3List.addAll(dataParam.getSteelLadleList());
factory3Adapter.notifyDataSetChanged();
}
}
private void getMachineData(String code) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("continuousCasterCode", code);
RtfUtils.getMesRtf().machineDetail("1", WorkUtils.convertMapToBody(param)).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.getMessage());
return;
}
MachineDetailBean machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
dataParam.setCastInfo(machineDetailBean.getCastInfo());
dataParam.setCastLadle(machineDetailBean.getCastLadle());
dataParam.setCovAgent(machineDetailBean.getCovAgent());
dataParam.setMouldFlu(machineDetailBean.getMouldFlu());
changeList();
}
});
}
private void changeList() {
MachineDetailBean.CastInfoBean castInfo = dataParam.getCastInfo();
if (castInfo != null) {
tvMachineType.setText(castInfo.getContinuousCasterType());
tvMachineName.setText(castInfo.getContinuousCasterName());
tvSection.setText(castInfo.getFractureSurface());
tvSteelType.setText(castInfo.getSteelGrade());
tvSpeed.setText(castInfo.getCastingSpeed());
}
MachineDetailBean.CastLadleBean castLadle = dataParam.getCastLadle();
if (castLadle != null) {
tvMiddle1.setText(castLadle.getCapacity());
tvMiddle2.setText(castLadle.getLifeSpan());
// tvMiddle3.setText(castLadle.getLadleCode());
tvMiddle4.setText(castLadle.getLiquidLevel());
tvMiddle5.setText(castLadle.getLiquidSteelTemperature());
tvMiddle6.setText(castLadle.getBakingMethod());
tvMiddle7.setText(castLadle.getBakingTemperature());
tvMiddle8.setText(String.valueOf(castLadle.getBakingDateTime()));
}
MachineDetailBean.CovAgentBean covAgent = dataParam.getCovAgent();
if (covAgent != null) {
tvCover1.setText(covAgent.getLadleCoveringAgentName());
tvCover2.setText(covAgent.getAcidAlkaliDegree());
tvCover3.setText(covAgent.getChemicalComposition());
tvCover4.setText(covAgent.getSupplierName());
}
MachineDetailBean.MouldFluBean mouldFlu = dataParam.getMouldFlu();
if (mouldFlu != null) {
tvProtection1.setText(mouldFlu.getMouldFluxesName());
tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
tvProtection3.setText(mouldFlu.getChemicalComposition());
tvProtection4.setText(mouldFlu.getSupplierName());
}
data1List.clear();
data2List.clear();
data3List.clear();
data4List.clear();
data5List.clear();
data6List.clear();
if (dataParam.getProductList() != null) {
for (MachineDetailBean.ProductListBean productListBean : dataParam.getProductList()) {
data1List.add(productListBean.getProductsName());
}
data1Adapter.notifyDataSetChanged();
}
if (dataParam.getSupplyList() != null) {
for (MachineDetailBean.SupplyListBean productListBean : dataParam.getSupplyList()) {
data2List.add(productListBean.getProductsName());
}
data2Adapter.notifyDataSetChanged();
}
if (dataParam.getOtherSupList() != null) {
for (MachineDetailBean.OtherSupListBean productListBean : dataParam.getOtherSupList()) {
data3List.add(productListBean.getSupplierName());
}
data3Adapter.notifyDataSetChanged();
}
if (dataParam.getOtherLadleList() != null) {
for (MachineDetailBean.OtherLadleListBean productListBean : dataParam.getOtherLadleList()) {
data4List.add(productListBean.getRefractoryName());
}
data4Adapter.notifyDataSetChanged();
}
if (dataParam.getStockList() != null) {
for (MachineDetailBean.StockListBean productListBean : dataParam.getStockList()) {
data5List.add(productListBean.getProductsName());
}
data5Adapter.notifyDataSetChanged();
}
if (dataParam.getSettleList() != null) {
for (MachineDetailBean.SettleListBean productListBean : dataParam.getSettleList()) {
data6List.add(productListBean.getSettlementMethod());
}
data6Adapter.notifyDataSetChanged();
}
}
@Override
protected void initEvent() {
factory1Adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
dataFactory1List.remove(position);
factory1Adapter.notifyDataSetChanged();
}
});
factory2Adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
dataFactory2List.remove(position);
data2Adapter.notifyDataSetChanged();
}
});
factory3Adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
switch (view.getId()) {
case R.id.tv_delete:
dataFactory3List.remove(position);
factory3Adapter.notifyDataSetChanged();
break;
case R.id.rl_time:
PickTimeUtils.showPickThree(MesUserDataDetailAddActivity.this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View v) {
dataFactory3List.get(position).setCastingDateTime(TimeUtils.date2Millis(date) / 1000);
factory3Adapter.notifyDataSetChanged();
}
}).show();
break;
}
}
});
String from = getIntent().getStringExtra("from");//1 .多步骤新增（同时新增）
data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesThreeModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getProductList().get(position)));
} else {
startActivity(MesThreeModifyActivity.class, "data", JSON.toJSONString(dataParam.getProductList().get(position)));
}
}
});
data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesSupplierModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getSupplyList().get(position)));
} else {
startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(dataParam.getSupplyList().get(position)));
}
}
});
data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesOtherSupplierModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getOtherSupList().get(position)));
} else {
startActivity(MesOtherSupplierModifyActivity.class, "data", JSON.toJSONString(dataParam.getOtherSupList().get(position)));
}
}
});
data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesPackageModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getOtherLadleList().get(position)));
} else {
startActivity(MesPackageModifyActivity.class, "data", JSON.toJSONString(dataParam.getOtherLadleList().get(position)));
}
}
});
data5Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesStockModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getStockList().get(position)));
} else {
startActivity(MesStockModifyActivity.class, "data", JSON.toJSONString(dataParam.getStockList().get(position)));
}
}
});
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesMiddleModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getSettleList().get(position)));
} else {
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(dataParam.getSettleList().get(position)));
}
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_detail_modify;
}
@OnClick({R.id.tv_factory_add1, R.id.tv_factory_add2, R.id.tv_factory_add3,
R.id.rl_cover4, R.id.rl_protection4, R.id.iv_modify_client,
R.id.iv_modify_machine, R.id.iv_modify_steel,
R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add4,R.id.rl_middle,R.id.rl_cover,R.id.rl_protection})
public void onViewClicked(View view) {
String from = getIntent().getStringExtra("from");//1 .多步骤新增（同时新增）
switch (view.getId()) {
case R.id.tv_factory_add1:
FactoryDetailBean.SteelFurnListBean data1 = new FactoryDetailBean.SteelFurnListBean();
dataFactory1List.add(data1);
factory1Adapter.notifyDataSetChanged();
break;
case R.id.tv_factory_add2:
FactoryDetailBean.SteelRefFurnListBean data2 = new FactoryDetailBean.SteelRefFurnListBean();
dataFactory2List.add(data2);
factory2Adapter.notifyDataSetChanged();
break;
case R.id.tv_factory_add3:
FactoryDetailBean.SteelLadleListBean data3 = new FactoryDetailBean.SteelLadleListBean();
dataFactory3List.add(data3);
factory3Adapter.notifyDataSetChanged();
break;
case R.id.rl_cover4:
startActivityForResult(MesChooseClientActivity.class,
10001, "from", "1");
break;
case R.id.rl_protection4:
startActivityForResult(MesChooseClientActivity.class,
10002, "from", "1");
break;
case R.id.iv_modify_client:
break;
case R.id.iv_modify_machine:
if (TextUtils.equals("1", from)) {
toast("保存成功");
} else {
submitMachine();
}
break;
case R.id.iv_modify_steel:
if (TextUtils.equals("1", from)) {
toast("保存成功");
} else {
submitFactory();
}
break;
case R.id.tv_add1:
if (TextUtils.equals("1", from)) {
startActivity(MesThreeAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
} else {
startActivity(MesThreeAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
}
break;
case R.id.tv_add2:
if (TextUtils.equals("1", from)) {
startActivity(MesSupplierAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
} else {
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
}
// startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add3:
if (TextUtils.equals("1", from)) {
startActivity(MesOtherSupplierAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
} else {
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
}
// startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add4:
if (TextUtils.equals("1", from)) {
startActivity(MesPackageAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
} else {
startActivity(MesPackageAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
}
// startActivity(MesPackageAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add5:
if (TextUtils.equals("1", from)) {
startActivity(MesStockAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "id", dataParam.getMainInfo().getCustomerUserCode());
} else {
startActivity(MesStockAddActivity.class,
"continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode()
, "id", dataParam.getMainInfo().getCustomerUserCode());
}
// startActivity(MesStockAddActivity.class,
// "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
// , "id", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add6:
if (TextUtils.equals("1", from)) {
startActivity(MesMiddleAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
} else {
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
}
// startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.rl_middle:
if (llMiddle.getVisibility() == View.VISIBLE) {
llMiddle.setVisibility(View.GONE);
} else {
llMiddle.setVisibility(View.VISIBLE);
}
break;
case R.id.rl_cover:
if (llCover.getVisibility() == View.VISIBLE) {
llCover.setVisibility(View.GONE);
} else {
llCover.setVisibility(View.VISIBLE);
}
break;
case R.id.rl_protection:
if (llProtection.getVisibility() == View.VISIBLE) {
llProtection.setVisibility(View.GONE);
} else {
llProtection.setVisibility(View.VISIBLE);
}
break;
}
}
private void changeViewModify(int type) {
switch (type) {
case 1:
changeViewClick(tvNum, !tvNum.isClickable());
changeViewClick(tvFactory, !tvFactory.isClickable());
changeViewClick(tvType, !tvType.isClickable());
break;
case 2:
changeViewClick(tvMachineType, !tvMachineType.isClickable());
changeViewClick(tvSection, !tvSection.isClickable());
changeViewClick(tvSteelType, !tvSteelType.isClickable());
changeViewClick(tvSpeed, !tvSpeed.isClickable());
changeViewClick(tvMiddle1, !tvMiddle1.isClickable());
changeViewClick(tvMiddle2, !tvMiddle2.isClickable());
changeViewClick(tvMiddle3, !tvMiddle3.isClickable());
changeViewClick(tvMiddle4, !tvMiddle4.isClickable());
changeViewClick(tvMiddle5, !tvMiddle5.isClickable());
changeViewClick(tvMiddle6, !tvMiddle6.isClickable());
changeViewClick(tvMiddle7, !tvMiddle7.isClickable());
changeViewClick(tvMiddle8, !tvMiddle8.isClickable());
changeViewClick(tvCover1, !tvCover1.isClickable());
changeViewClick(tvCover2, !tvCover2.isClickable());
changeViewClick(tvCover3, !tvCover3.isClickable());
// changeViewClick(tvCover4, !tvCover4.isClickable());
rlCover4.setClickable(!rlCover4.isClickable());
changeViewClick(tvProtection1, !tvProtection1.isClickable());
changeViewClick(tvProtection2, !tvProtection2.isClickable());
changeViewClick(tvProtection3, !tvProtection3.isClickable());
// changeViewClick(tvProtection4, !tvProtection4.isClickable());
tvProtection4.setClickable(!tvProtection4.isClickable());
break;
}
}
private void changeViewClick(EditText view, boolean canClick) {
view.setClickable(canClick);
view.setFocusable(canClick);
view.setFocusableInTouchMode(canClick);
}
@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:
submitAll();
break;
}
return super.onOptionsItemSelected(item);
}
private void submitAll() {
// Map<String, Object> param = WorkUtils.simpleParam();
// param.put("mainInfo", data);
// JSONObject steelInfo = new JSONObject();
// steelInfo.put("steelmakingWorksCode", data.getSteelmakingWorksCode());
//// steelInfo.put("steelmakingFurnaceCode", data.getSteelmakingWorksCode());
//// steelInfo.put("refiningFurnaceCode", data.getSteelmakingWorksCode());
//// 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());
// }
changeFactoryParam();
changeMachineParam();
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), JSON.toJSONString(dataParam));
showLoading();
RtfUtils.getMesRtf().userDataAdd("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.getMessage());
return;
}
toast("添加成功");
EventBus.getDefault().post(new AddUserDataEvent());
finish();
}
});
}
private void changeMachineParam() {
MachineDetailBean.CastInfoBean castInfo = dataParam.getCastInfo();
if (castInfo == null) {
castInfo = new MachineDetailBean.CastInfoBean();
dataParam.setCastInfo(castInfo);
}
castInfo.setContinuousCasterName(tvMachineName.getText().toString());
castInfo.setContinuousCasterType(tvMachineType.getText().toString());
castInfo.setFractureSurface(tvSection.getText().toString());
castInfo.setSteelGrade(tvSteelType.getText().toString());
castInfo.setCastingSpeed(tvSpeed.getText().toString());
castInfo.setSteelmakingWorksCode(dataParam.getMainInfo().getSteelmakingWorksCode());
castInfo.setSteelmakingWorksName(dataParam.getMainInfo().getSteelmakingWorksName());
MachineDetailBean.CastLadleBean castLadle = dataParam.getCastLadle();
if (castLadle == null) {
castLadle = new MachineDetailBean.CastLadleBean();
dataParam.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());
String time = tvMiddle8.getText().toString();
if (!TextUtils.isEmpty(time)) {
castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
}
MachineDetailBean.CovAgentBean covAgent = dataParam.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
dataParam.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 = dataParam.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
dataParam.setMouldFlu(mouldFlu);
}
mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
mouldFlu.setAcidAlkaliDegree(tvProtection2.getText().toString());
mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
mouldFlu.setSupplierName(tvProtection4.getText().toString());
}
private void changeFactoryParam() {
FactoryDetailBean.SteelWorksBean steelWorks = dataParam.getSteelWorks();
if (steelWorks != null) {
steelWorks.setAnnualOutput(tvNum.getText().toString());
steelWorks.setSteelmakingWorksName(tvFactory.getText().toString());
steelWorks.setSteelGrade(tvType.getText().toString());
}
if (dataParam.getSteelFurnList() != null) {
dataParam.getSteelFurnList().clear();
dataParam.getSteelFurnList().addAll(dataFactory1List);
}
if (dataParam.getSteelRefFurnList() != null) {
dataParam.getSteelRefFurnList().clear();
dataParam.getSteelRefFurnList().addAll(dataFactory2List);
}
if (dataParam.getSteelLadleList() != null) {
dataParam.getSteelLadleList().clear();
dataParam.getSteelLadleList().addAll(dataFactory3List);
}
}
private void submitMachine() {
showLoading();
changeMachineParam();
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), JSON.toJSONString(dataParam));
RtfUtils.getMesRtf().machineAdd("1", "2", 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.getMessage());
return;
}
toast("编辑成功");
}
});
}
private void submitFactory() {
if (!checkParam()) {
return;
}
changeFactoryParam();
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), JSON.toJSONString(dataParam));
showLoading();
RtfUtils.getMesRtf().factoryAdd("1", "2", 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.getMessage());
return;
}
toast("编辑成功");
}
});
}
private boolean checkParam() {
boolean dataHasNull = false;
for (FactoryDetailBean.SteelFurnListBean steelFurnListBean : dataFactory1List) {
if (TextUtils.isEmpty(steelFurnListBean.getCapacity())
|| TextUtils.isEmpty(steelFurnListBean.getType())) {
dataHasNull = true;
}
}
if (dataHasNull) {
toast("请填写炼钢厂数据");
return false;
}
for (FactoryDetailBean.SteelRefFurnListBean steelRefFurnListBean : dataFactory2List) {
if (TextUtils.isEmpty(steelRefFurnListBean.getModelNumber())
|| TextUtils.isEmpty(steelRefFurnListBean.getCalciumTreatmentSituation())) {
dataHasNull = true;
}
}
if (dataHasNull) {
toast("请填写精炼厂数据");
return false;
}
for (FactoryDetailBean.SteelLadleListBean steelLadleListBean : dataFactory3List) {
if (TextUtils.isEmpty(steelLadleListBean.getCapacity()) || steelLadleListBean.getCastingDateTime() == null
|| TextUtils.isEmpty(steelLadleListBean.getTemperatureRange())) {
dataHasNull = true;
}
}
if (dataHasNull) {
toast("请填写钢包数据");
return false;
}
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 refresh(AddMachineAddChildEvent event) {
switch (event.getType()) {
case 1:
List<MachineDetailBean.ProductListBean> productList = dataParam.getProductList();
if (productList == null) {
dataParam.setProductList(new ArrayList<>());
}
dataParam.getProductList().add(JSON.parseObject(event.getData(), MachineDetailBean.ProductListBean.class));
break;
case 2:
List<MachineDetailBean.SupplyListBean> supplierList = dataParam.getSupplyList();
if (supplierList == null) {
dataParam.setSupplyList(new ArrayList<>());
}
dataParam.getSupplyList().add(JSON.parseObject(event.getData(), MachineDetailBean.SupplyListBean.class));
break;
case 3:
List<MachineDetailBean.OtherSupListBean> supplyList = dataParam.getOtherSupList();
if (supplyList == null) {
dataParam.setOtherSupList(new ArrayList<>());
}
dataParam.getOtherSupList().add(JSON.parseObject(event.getData(), MachineDetailBean.OtherSupListBean.class));
break;
case 4:
List<MachineDetailBean.OtherLadleListBean> otherLadleList = dataParam.getOtherLadleList();
if (otherLadleList == null) {
dataParam.setOtherLadleList(new ArrayList<>());
}
dataParam.getOtherLadleList().add(JSON.parseObject(event.getData(), MachineDetailBean.OtherLadleListBean.class));
break;
case 5:
List<MachineDetailBean.StockListBean> stockList = dataParam.getStockList();
if (stockList == null) {
dataParam.setStockList(new ArrayList<>());
}
dataParam.getStockList().add(JSON.parseObject(event.getData(), MachineDetailBean.StockListBean.class));
break;
case 6:
List<MachineDetailBean.SettleListBean> settleList = dataParam.getSettleList();
if (settleList == null) {
dataParam.setSettleList(new ArrayList<>());
}
dataParam.getSettleList().add(JSON.parseObject(event.getData(), MachineDetailBean.SettleListBean.class));
break;
}
changeList();
}
@Subscribe
public void modify(AddMachineModifyChildEvent event) {
switch (event.getType()) {
case 1:
List<MachineDetailBean.ProductListBean> productList = dataParam.getProductList();
if (productList == null) {
dataParam.setProductList(new ArrayList<>());
}
productList.remove(event.getPosition());
productList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.ProductListBean.class));
break;
case 2:
List<MachineDetailBean.SupplyListBean> supplierList = dataParam.getSupplyList();
if (supplierList == null) {
dataParam.setSupplyList(new ArrayList<>());
}
supplierList.remove(event.getPosition());
supplierList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.SupplyListBean.class));
break;
case 3:
List<MachineDetailBean.OtherSupListBean> supplyList = dataParam.getOtherSupList();
if (supplyList == null) {
dataParam.setOtherSupList(new ArrayList<>());
}
supplyList.remove(event.getPosition());
supplyList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.OtherSupListBean.class));
break;
case 4:
List<MachineDetailBean.OtherLadleListBean> otherLadleList = dataParam.getOtherLadleList();
if (otherLadleList == null) {
dataParam.setOtherLadleList(new ArrayList<>());
}
otherLadleList.remove(event.getPosition());
otherLadleList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.OtherLadleListBean.class));
break;
case 5:
List<MachineDetailBean.StockListBean> stockList = dataParam.getStockList();
if (stockList == null) {
dataParam.setStockList(new ArrayList<>());
}
stockList.remove(event.getPosition());
stockList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.StockListBean.class));
break;
case 6:
List<MachineDetailBean.SettleListBean> settleList = dataParam.getSettleList();
if (settleList == null) {
dataParam.setSettleList(new ArrayList<>());
}
settleList.remove(event.getPosition());
settleList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.SettleListBean.class));
break;
}
changeList();
}
@Subscribe
public void refresh(RefreshMachineEvent event) {
changeInfo();
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case 10001:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.CovAgentBean covAgent = dataParam.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
dataParam.setCovAgent(covAgent);
}
tvCover4.setText(modifyClient.getCustomerName());
covAgent.setSupplierCode(modifyClient.getCustomerCode());
covAgent.setSupplierName(modifyClient.getCustomerName());
}
break;
case 10002:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.MouldFluBean mouldFlu = dataParam.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
dataParam.setMouldFlu(mouldFlu);
}
tvProtection4.setText(modifyClient.getCustomerName());
mouldFlu.setSupplierCode(modifyClient.getCustomerCode());
mouldFlu.setSupplierCode(modifyClient.getCustomerName());
}
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailModifyActivity.java
浏览文件 @ 0e20943b
......@@ -551,7 +551,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
@OnClick({R.id.tv_factory_add1, R.id.tv_factory_add2, R.id.tv_factory_add3, R.id.rl_cover4, R.id.rl_protection4, R.id.iv_modify_client, R.id.iv_modify_machine, R.id.iv_modify_steel,
R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add4})
R.id.tv_add4,R.id.rl_middle,R.id.rl_cover,R.id.rl_protection})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_factory_add1:
......
app/src/main/res/layout/activity_mes_user_data_factory_add.xml
浏览文件 @ 0e20943b
......@@ -130,7 +130,7 @@
android:id="@+id/rv_data3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm" />
/>
<TextView
android:id="@+id/tv_add3"
......
app/src/main/res/layout/activity_mes_user_data_machine_add.xml
浏览文件 @ 0e20943b
......@@ -926,6 +926,15 @@
</LinearLayout>
</RelativeLayout>
<TextView
android:visibility="gone"
android:id="@+id/tv_next"
android:layout_width="match_parent"
android:background="@color/blue_btn"
android:text="下一步"
android:textColor="@color/white"
android:gravity="center"
android:layout_height="40mm" />
<RelativeLayout
android:id="@+id/rl_add"
android:layout_width="match_parent"
......
app/src/main/res/layout/activity_mes_user_data_machine_detail.xml
浏览文件 @ 0e20943b
......@@ -917,5 +917,14 @@
android:text="+添加"
android:textSize="14sp" />
</RelativeLayout>
<TextView
android:id="@+id/tv_next"
android:layout_width="match_parent"
android:background="@color/blue_btn"
android:text="下一步"
android:textColor="@color/white"
android:gravity="center"
android:layout_height="40mm" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/item_user_add_factory_label.xml
浏览文件 @ 0e20943b
......@@ -126,7 +126,7 @@
android:textSize="14sp" />
<EditText
<TextView
android:id="@+id/et_content3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -134,8 +134,6 @@
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:clickable="false"
android:focusable="false"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论