Skip to content

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

1.炼钢厂新增 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改,
上级 53d6c12a
隐藏空白字符变更
内嵌 并排
正在显示 包含 740 行增加 和 237 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/FactoryDetailBean.java
浏览文件 @ 7bd2ae8e
......@@ -113,8 +113,8 @@ public class FactoryDetailBean {
*/
private String id;
private long createDateTime;
private long updateDateTime;
private Long createDateTime;
private Long updateDateTime;
private String steelmakingWorksCode;
private String steelmakingWorksName;
private String annualOutput;
......@@ -125,7 +125,7 @@ public class FactoryDetailBean {
private String updateUserName;
private Object remark;
private String customerUserCode;
private boolean delete;
private Boolean delete;
public String getId() {
return id;
......@@ -135,19 +135,19 @@ public class FactoryDetailBean {
this.id = id;
}
public long getCreateDateTime() {
public Long getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(long createDateTime) {
public void setCreateDateTime(Long createDateTime) {
this.createDateTime = createDateTime;
}
public long getUpdateDateTime() {
public Long getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(long updateDateTime) {
public void setUpdateDateTime(Long updateDateTime) {
this.updateDateTime = updateDateTime;
}
......@@ -231,11 +231,11 @@ public class FactoryDetailBean {
this.customerUserCode = customerUserCode;
}
public boolean isDelete() {
public Boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
public void setDelete(Boolean delete) {
this.delete = delete;
}
}
......@@ -261,8 +261,8 @@ public class FactoryDetailBean {
private String id;
private Object isDelete;
private long createDateTime;
private long updateDateTime;
private Long createDateTime;
private Long updateDateTime;
private String steelmakingFurnaceCode;
private String steelmakingWorksCode;
private String steelmakingWorksName;
......@@ -291,19 +291,19 @@ public class FactoryDetailBean {
this.isDelete = isDelete;
}
public long getCreateDateTime() {
public Long getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(long createDateTime) {
public void setCreateDateTime(Long createDateTime) {
this.createDateTime = createDateTime;
}
public long getUpdateDateTime() {
public Long getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(long updateDateTime) {
public void setUpdateDateTime(Long updateDateTime) {
this.updateDateTime = updateDateTime;
}
......@@ -418,8 +418,8 @@ public class FactoryDetailBean {
private String id;
private Object isDelete;
private long createDateTime;
private long updateDateTime;
private Long createDateTime;
private Long updateDateTime;
private String refiningFurnaceCode;
private String steelmakingWorksCode;
private String steelmakingWorksName;
......@@ -449,19 +449,19 @@ public class FactoryDetailBean {
this.isDelete = isDelete;
}
public long getCreateDateTime() {
public Long getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(long createDateTime) {
public void setCreateDateTime(Long createDateTime) {
this.createDateTime = createDateTime;
}
public long getUpdateDateTime() {
public Long getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(long updateDateTime) {
public void setUpdateDateTime(Long updateDateTime) {
this.updateDateTime = updateDateTime;
}
......@@ -582,20 +582,20 @@ public class FactoryDetailBean {
*/
private String id;
private long createDateTime;
private long updateDateTime;
private Long createDateTime;
private Long updateDateTime;
private String ladleCode;
private String steelmakingWorksCode;
private String steelmakingWorksName;
private String capacity;
private String temperatureRange;
private long castingDateTime;
private Long castingDateTime;
private String createUserId;
private Object createUserName;
private String updateUserId;
private String updateUserName;
private Object remark;
private boolean delete;
private Boolean delete;
public String getId() {
return id;
......@@ -605,19 +605,19 @@ public class FactoryDetailBean {
this.id = id;
}
public long getCreateDateTime() {
public Long getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(long createDateTime) {
public void setCreateDateTime(Long createDateTime) {
this.createDateTime = createDateTime;
}
public long getUpdateDateTime() {
public Long getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(long updateDateTime) {
public void setUpdateDateTime(Long updateDateTime) {
this.updateDateTime = updateDateTime;
}
......@@ -661,11 +661,11 @@ public class FactoryDetailBean {
this.temperatureRange = temperatureRange;
}
public long getCastingDateTime() {
public Long getCastingDateTime() {
return castingDateTime;
}
public void setCastingDateTime(long castingDateTime) {
public void setCastingDateTime(Long castingDateTime) {
this.castingDateTime = castingDateTime;
}
......@@ -709,11 +709,11 @@ public class FactoryDetailBean {
this.remark = remark;
}
public boolean isDelete() {
public Boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
public void setDelete(Boolean delete) {
this.delete = delete;
}
}
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ 7bd2ae8e
......@@ -245,9 +245,6 @@ public interface MesApiService {
Observable<BaseMesBean> stockAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/**
* 审核接口
*
......@@ -281,4 +278,13 @@ public interface MesApiService {
@GET("/himes/api/msLadleRefractoryRecord/show/{id}.json")
Observable<BaseMesBean> packageDetail(@Path("id") String id, @Query("functionId") String functionId);
/**
* 炼钢厂保存、更新
*
* @return
*/
@POST("/himes/api/msSteelmakingWorks/save.json")
Observable<BaseMesBean> factoryAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.java
浏览文件 @ 7bd2ae8e
......@@ -134,7 +134,6 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search)
public void onViewClicked() {
param.put("steelmakingWorksName", etKey.getText().toString());
param.put("current", 1);
getData();
}
......@@ -148,7 +147,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
startActivity(MesChooseFactoryAddActivity.class);
startActivity(MesChooseFactoryAddActivity.class, "data", JSON.toJSONString(data));
break;
}
return super.onOptionsItemSelected(item);
......@@ -168,6 +167,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
@Subscribe
public void refresh(AddFactoryEvent event) {
getData();
}
@Subscribe
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryAddActivity.java
浏览文件 @ 7bd2ae8e
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;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.event.AddFactoryEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
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.UserDataAdd3LabelAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAddAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
......@@ -27,6 +41,7 @@ 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;
/**
......@@ -36,10 +51,12 @@ import io.reactivex.disposables.Disposable;
* github: https://github.com/FlexibleXd
**/
public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_client)
EditText tvClient;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
@BindView(R.id.et_name)
EditText etName;
@BindView(R.id.et_sum)
EditText etSum;
@BindView(R.id.et_type)
EditText etType;
@BindView(R.id.rv_data1)
RecyclerView rvData1;
@BindView(R.id.tv_add1)
......@@ -48,80 +65,106 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
RecyclerView rvData2;
@BindView(R.id.tv_add2)
TextView tvAdd2;
@BindView(R.id.rv_data3)
RecyclerView rvData3;
@BindView(R.id.tv_add3)
TextView tvAdd3;
@BindView(R.id.rl_factory)
RelativeLayout rlFactory;
private AccountBean dataBean;
private List<FactoryDetailBean.SteelFurnListBean> data1List;
private List<FactoryDetailBean.SteelRefFurnListBean> data2List;
private List<FactoryDetailBean.SteelLadleListBean> data3List;
private UserDataAdd3AddAdapter data1Adapter;
private UserDataAdd3RefAddAdapter data2Adapter;
private UserDataAdd3LabelAddAdapter data3Adapter;
private UserDataBean.ListBean data;
@Override
protected void initView() {
ButterKnife.bind(this);
rvData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
List<Object> data1List = new ArrayList<>();
data1List.add(null);
data1List.add(null);
data1List.add(null);
List<Object> data2List = new ArrayList<>();
data2List.add(null);
data2List.add(null);
data2List.add(null);
UserDataAdd3Adapter data1Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3_add, data1List);
UserDataAdd3Adapter data2Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3_add, data2List);
data = JSON.parseObject(getIntent().getStringExtra("data"), UserDataBean.ListBean.class);
data1List = new ArrayList<>();
data2List = new ArrayList<>();
data3List = new ArrayList<>();
data1Adapter = new UserDataAdd3AddAdapter(R.layout.item_user_add3_add, data1List);
data2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add, data2List);
data3Adapter = new UserDataAdd3LabelAddAdapter(R.layout.item_user_add_factory_label, data3List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
getData();
data3Adapter.bindToRecyclerView(rvData3);
}
private void getData() {
RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
protected void initEvent() {
data1Adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void doOnSubscribe(Disposable d) {
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
data1List.remove(position);
data1Adapter.notifyDataSetChanged();
}
});
data2Adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
data2List.remove(position);
data2Adapter.notifyDataSetChanged();
}
});
data3Adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
switch (view.getId()) {
case R.id.tv_delete:
data3List.remove(position);
data3Adapter.notifyDataSetChanged();
break;
case R.id.rl_time:
PickTimeUtils.showPickThree(MesChooseFactoryAddActivity.this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View v) {
data3List.get(position).setCastingDateTime(TimeUtils.date2Millis(date)/1000);
data3Adapter.notifyDataSetChanged();
}
}).show();
break;
}
dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
// tvName.setText(dataBean.getName());
// tvDpeName.setText(dataBean.getName());
// tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
// tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
}
});
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_factory_add;
}
@OnClick({R.id.tv_add1, R.id.tv_add2, R.id.rl_factory})
@OnClick({R.id.tv_add1, R.id.tv_add2, R.id.tv_add3, R.id.rl_factory})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_add1:
FactoryDetailBean.SteelFurnListBean data = new FactoryDetailBean.SteelFurnListBean();
data1List.add(data);
data1Adapter.notifyDataSetChanged();
break;
case R.id.tv_add2:
FactoryDetailBean.SteelRefFurnListBean data2 = new FactoryDetailBean.SteelRefFurnListBean();
data2List.add(data2);
data2Adapter.notifyDataSetChanged();
break;
case R.id.tv_add3:
FactoryDetailBean.SteelLadleListBean data3 = new FactoryDetailBean.SteelLadleListBean();
data3List.add(data3);
data3Adapter.notifyDataSetChanged();
break;
case R.id.rl_factory:
EventBus.getDefault().post(new AddFactoryEvent());
......@@ -129,4 +172,98 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
}
}
@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:
submit();
break;
}
return super.onOptionsItemSelected(item);
}
private void submit() {
Map<String, Object> param = WorkUtils.simpleParam();
String name = etName.getText().toString();
String sum = etSum.getText().toString();
String type = etType.getText().toString();
JSONObject steelWorks = new JSONObject();
steelWorks.put("steelmakingWorksName", name);
steelWorks.put("annualOutput", sum);
steelWorks.put("steelGrade", type);
steelWorks.put("customerUserCode", data.getCustomerUserCode());
param.put("steelWorks", steelWorks);
if (!checkParam()) {
return;
}
param.put("steelRefFurnList", data2List);
param.put("steelLadleList", data3List);
param.put("steelFurnList", data1List);
showLoading();
RtfUtils.getMesRtf().factoryAdd("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.getMsg());
return;
}
toast("添加成功");
EventBus.getDefault().post(new AddFactoryEvent());
finish();
}
});
}
private boolean checkParam() {
boolean dataHasNull = false;
for (FactoryDetailBean.SteelFurnListBean steelFurnListBean : data1List) {
if (TextUtils.isEmpty(steelFurnListBean.getCapacity()) || TextUtils.isEmpty(steelFurnListBean.getSteelmakingFurnaceCode())
|| TextUtils.isEmpty(steelFurnListBean.getType())) {
dataHasNull = true;
}
}
if (dataHasNull) {
toast("请填写炼钢厂数据");
return false;
}
for (FactoryDetailBean.SteelRefFurnListBean steelRefFurnListBean : data2List) {
if (TextUtils.isEmpty(steelRefFurnListBean.getRefiningFurnaceCode()) || TextUtils.isEmpty(steelRefFurnListBean.getModelNumber())
|| TextUtils.isEmpty(steelRefFurnListBean.getCalciumTreatmentSituation())) {
dataHasNull = true;
}
}
if (dataHasNull) {
toast("请填写精炼厂数据");
return false;
}
for (FactoryDetailBean.SteelLadleListBean steelLadleListBean : data3List) {
if (TextUtils.isEmpty(steelLadleListBean.getCapacity()) || steelLadleListBean.getCastingDateTime() == null
|| TextUtils.isEmpty(steelLadleListBean.getTemperatureRange()) || TextUtils.isEmpty(steelLadleListBean.getLadleCode())) {
dataHasNull = true;
}
}
if (dataHasNull) {
toast("请填写钢包数据");
return false;
}
return true;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd2Activity.java
浏览文件 @ 7bd2ae8e
......@@ -102,21 +102,21 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity {
return R.layout.activity_mes_user_data_add2;
}
@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:
startActivity(MesUserDataAdd3Activity.class);
break;
}
return super.onOptionsItemSelected(item);
}
// @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:
// startActivity(MesUserDataAdd3Activity.class);
// break;
// }
// return super.onOptionsItemSelected(item);
// }
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd3Activity.java
浏览文件 @ 7bd2ae8e
......@@ -147,21 +147,21 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
return R.layout.activity_mes_user_data_add3;
}
@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:
startActivity(MesChooseClientActivity.class);
break;
}
return super.onOptionsItemSelected(item);
}
// @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:
// startActivity(MesChooseClientActivity.class);
// break;
// }
// return super.onOptionsItemSelected(item);
// }
@Override
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAddActivity.java
浏览文件 @ 7bd2ae8e
......@@ -57,21 +57,21 @@ public class MesUserDataAddActivity extends WorkToolBarActivity {
return R.layout.activity_mes_user_data_add1;
}
@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:
startActivity(MesUserDataAdd2Activity.class);
break;
}
return super.onOptionsItemSelected(item);
}
// @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:
// startActivity(MesUserDataAdd2Activity.class);
// break;
// }
// return super.onOptionsItemSelected(item);
// }
@OnClick(R.id.rl_client)
......
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3AddAdapter.java 0 → 100644
浏览文件 @ 7bd2ae8e
package com.wd.workoffice.ui.adapter;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
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 UserDataAdd3AddAdapter extends BaseQuickAdapter<FactoryDetailBean.SteelFurnListBean, BaseViewHolder> {
public UserDataAdd3AddAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, FactoryDetailBean.SteelFurnListBean item) {
View content = helper.getView(R.id.ll_content);
helper.setOnClickListener(R.id.rl_title, new View.OnClickListener() {
@Override
public void onClick(View v) {
if (content.getVisibility() == View.VISIBLE) {
content.setVisibility(View.GONE);
} else {
content.setVisibility(View.VISIBLE);
}
}
});
helper.addOnClickListener(R.id.tv_delete);
helper.setText(R.id.et_name, item.getSteelmakingFurnaceCode());
helper.setText(R.id.et_content1, item.getType());
helper.setText(R.id.et_content2, item.getCapacity());
EditText etName = helper.getView(R.id.et_name);
EditText etContent1 = helper.getView(R.id.et_content1);
EditText etContent2 = helper.getView(R.id.et_content2);
etName.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
item.setSteelmakingFurnaceCode(s.toString());
}
});
etContent1.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
item.setType(s.toString());
}
});
etContent2.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
item.setCapacity(s.toString());
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3LabelAdapter.java
浏览文件 @ 7bd2ae8e
......@@ -40,7 +40,7 @@ public class UserDataAdd3LabelAdapter extends BaseQuickAdapter<FactoryDetailBean
helper.setText(R.id.tv_name, item.getLadleCode());
helper.setText(R.id.tv_content1, item.getCapacity());
helper.setText(R.id.tv_content2, item.getTemperatureRange());
helper.setText(R.id.tv_content3, TimeUtils.millis2String(item.getCastingDateTime()));
helper.setText(R.id.tv_content3, TimeUtils.millis2String(item.getCastingDateTime()*1000));
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3LabelAddAdapter.java 0 → 100644
浏览文件 @ 7bd2ae8e
package com.wd.workoffice.ui.adapter;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
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.text.SimpleDateFormat;
import java.util.List;
import flexible.xd.android_base.utils.TimeUtils;
/**
* Created by flexible on 2018/8/13.
*/
public class UserDataAdd3LabelAddAdapter extends BaseQuickAdapter<FactoryDetailBean.SteelLadleListBean, BaseViewHolder> {
public UserDataAdd3LabelAddAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, FactoryDetailBean.SteelLadleListBean item) {
View content = helper.getView(R.id.ll_content);
helper.setOnClickListener(R.id.rl_title, new View.OnClickListener() {
@Override
public void onClick(View v) {
if (content.getVisibility() == View.VISIBLE) {
content.setVisibility(View.GONE);
} else {
content.setVisibility(View.VISIBLE);
}
}
});
helper.addOnClickListener(R.id.rl_time);
helper.addOnClickListener(R.id.tv_delete);
helper.setText(R.id.et_name, item.getLadleCode());
helper.setText(R.id.et_content1, item.getCapacity());
helper.setText(R.id.et_content2, item.getTemperatureRange());
if (item.getCastingDateTime() != null) {
helper.setText(R.id.et_content3, TimeUtils.millis2String(item.getCastingDateTime()*1000,new SimpleDateFormat("yyyy-MM-dd")));
}
EditText etName = helper.getView(R.id.et_name);
EditText etContent1 = helper.getView(R.id.et_content1);
EditText etContent2 = helper.getView(R.id.et_content2);
EditText etContent3 = helper.getView(R.id.et_content3);
etName.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
item.setLadleCode(s.toString());
}
});
etContent1.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
item.setCapacity(s.toString());
}
});
etContent2.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
item.setTemperatureRange(s.toString());
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3RefAddAdapter.java 0 → 100644
浏览文件 @ 7bd2ae8e
package com.wd.workoffice.ui.adapter;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
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 UserDataAdd3RefAddAdapter extends BaseQuickAdapter<FactoryDetailBean.SteelRefFurnListBean, BaseViewHolder> {
public UserDataAdd3RefAddAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, FactoryDetailBean.SteelRefFurnListBean item) {
View content = helper.getView(R.id.ll_content);
helper.setOnClickListener(R.id.rl_title, new View.OnClickListener() {
@Override
public void onClick(View v) {
if (content.getVisibility() == View.VISIBLE) {
content.setVisibility(View.GONE);
} else {
content.setVisibility(View.VISIBLE);
}
}
});
helper.setText(R.id.tv_desc1, "型号和台数");
helper.setText(R.id.tv_desc2, "钙处理方式");
helper.addOnClickListener(R.id.tv_delete);
helper.setText(R.id.et_name, item.getRefiningFurnaceCode());
helper.setText(R.id.et_content1, item.getModelNumber());
helper.setText(R.id.et_content2, item.getCalciumTreatmentSituation());
EditText etName = helper.getView(R.id.et_name);
EditText etContent1 = helper.getView(R.id.et_content1);
EditText etContent2 = helper.getView(R.id.et_content2);
etName.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
item.setRefiningFurnaceCode(s.toString());
}
});
etContent1.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
item.setModelNumber(s.toString());
}
});
etContent2.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
item.setCalciumTreatmentSituation(s.toString());
}
});
}
}
app/src/main/res/layout/activity_mes_user_data_factory_add.xml
浏览文件 @ 7bd2ae8e
......@@ -10,7 +10,6 @@
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_client"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
......@@ -22,12 +21,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="客户"
android:text="炼钢厂"
android:textSize="14sp" />
<EditText
android:id="@+id/tv_client"
android:id="@+id/et_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -51,11 +50,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="销售公司"
android:text="年产量"
android:textSize="14sp" />
<EditText
android:id="@+id/et_sum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -78,10 +78,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="销售经理"
android:text="钢种"
android:textSize="14sp" />
<EditText
android:id="@+id/et_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -125,116 +126,23 @@
android:text="+添加精炼炉"
android:textColor="@color/blue_btn"
android:textSize="15sp" />
<RelativeLayout
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
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" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
android:layout_marginTop="10mm" />
<LinearLayout
<TextView
android:id="@+id/tv_add3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="容量"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="温度范围"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="每炉浇铸时间"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
android:gravity="center"
android:paddingVertical="15mm"
android:text="+添加钢包"
android:textColor="@color/blue_btn"
android:textSize="15sp" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/rl_factory"
......
app/src/main/res/layout/item_user_add3_add.xml
浏览文件 @ 7bd2ae8e
......@@ -13,11 +13,13 @@
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
<EditText
android:id="@+id/et_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="炼钢炉"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
<LinearLayout
......@@ -27,6 +29,7 @@
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
......@@ -59,6 +62,7 @@
android:paddingLeft="25mm">
<TextView
android:id="@+id/tv_desc1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
......@@ -68,6 +72,7 @@
<EditText
android:id="@+id/et_content1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -85,6 +90,7 @@
android:paddingLeft="25mm">
<TextView
android:id="@+id/tv_desc2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
......@@ -94,6 +100,7 @@
<EditText
android:id="@+id/et_content2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......
app/src/main/res/layout/item_user_add_factory_label.xml 0 → 100644
浏览文件 @ 7bd2ae8e
<?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:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<EditText
android:id="@+id/et_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:paddingHorizontal="10mm"
android:text="删除"
android:textColor="#ffba6262"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3mm"
android:src="@mipmap/mes_arrow_down" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="容量"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:id="@+id/et_content1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="温度范围"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:id="@+id/et_content2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="每炉浇铸时间"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:id="@+id/et_content3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:clickable="false"
android:focusable="false"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论