Skip to content

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

1.炼钢厂新增 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改,
上级 53d6c12a
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 560 行增加 和 194 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/FactoryDetailBean.java
浏览文件 @ 7bd2ae8e
...@@ -113,8 +113,8 @@ public class FactoryDetailBean { ...@@ -113,8 +113,8 @@ public class FactoryDetailBean {
*/ */
private String id; private String id;
private long createDateTime; private Long createDateTime;
private long updateDateTime; private Long updateDateTime;
private String steelmakingWorksCode; private String steelmakingWorksCode;
private String steelmakingWorksName; private String steelmakingWorksName;
private String annualOutput; private String annualOutput;
...@@ -125,7 +125,7 @@ public class FactoryDetailBean { ...@@ -125,7 +125,7 @@ public class FactoryDetailBean {
private String updateUserName; private String updateUserName;
private Object remark; private Object remark;
private String customerUserCode; private String customerUserCode;
private boolean delete; private Boolean delete;
public String getId() { public String getId() {
return id; return id;
...@@ -135,19 +135,19 @@ public class FactoryDetailBean { ...@@ -135,19 +135,19 @@ public class FactoryDetailBean {
this.id = id; this.id = id;
} }
public long getCreateDateTime() { public Long getCreateDateTime() {
return createDateTime; return createDateTime;
} }
public void setCreateDateTime(long createDateTime) { public void setCreateDateTime(Long createDateTime) {
this.createDateTime = createDateTime; this.createDateTime = createDateTime;
} }
public long getUpdateDateTime() { public Long getUpdateDateTime() {
return updateDateTime; return updateDateTime;
} }
public void setUpdateDateTime(long updateDateTime) { public void setUpdateDateTime(Long updateDateTime) {
this.updateDateTime = updateDateTime; this.updateDateTime = updateDateTime;
} }
...@@ -231,11 +231,11 @@ public class FactoryDetailBean { ...@@ -231,11 +231,11 @@ public class FactoryDetailBean {
this.customerUserCode = customerUserCode; this.customerUserCode = customerUserCode;
} }
public boolean isDelete() { public Boolean isDelete() {
return delete; return delete;
} }
public void setDelete(boolean delete) { public void setDelete(Boolean delete) {
this.delete = delete; this.delete = delete;
} }
} }
...@@ -261,8 +261,8 @@ public class FactoryDetailBean { ...@@ -261,8 +261,8 @@ public class FactoryDetailBean {
private String id; private String id;
private Object isDelete; private Object isDelete;
private long createDateTime; private Long createDateTime;
private long updateDateTime; private Long updateDateTime;
private String steelmakingFurnaceCode; private String steelmakingFurnaceCode;
private String steelmakingWorksCode; private String steelmakingWorksCode;
private String steelmakingWorksName; private String steelmakingWorksName;
...@@ -291,19 +291,19 @@ public class FactoryDetailBean { ...@@ -291,19 +291,19 @@ public class FactoryDetailBean {
this.isDelete = isDelete; this.isDelete = isDelete;
} }
public long getCreateDateTime() { public Long getCreateDateTime() {
return createDateTime; return createDateTime;
} }
public void setCreateDateTime(long createDateTime) { public void setCreateDateTime(Long createDateTime) {
this.createDateTime = createDateTime; this.createDateTime = createDateTime;
} }
public long getUpdateDateTime() { public Long getUpdateDateTime() {
return updateDateTime; return updateDateTime;
} }
public void setUpdateDateTime(long updateDateTime) { public void setUpdateDateTime(Long updateDateTime) {
this.updateDateTime = updateDateTime; this.updateDateTime = updateDateTime;
} }
...@@ -418,8 +418,8 @@ public class FactoryDetailBean { ...@@ -418,8 +418,8 @@ public class FactoryDetailBean {
private String id; private String id;
private Object isDelete; private Object isDelete;
private long createDateTime; private Long createDateTime;
private long updateDateTime; private Long updateDateTime;
private String refiningFurnaceCode; private String refiningFurnaceCode;
private String steelmakingWorksCode; private String steelmakingWorksCode;
private String steelmakingWorksName; private String steelmakingWorksName;
...@@ -449,19 +449,19 @@ public class FactoryDetailBean { ...@@ -449,19 +449,19 @@ public class FactoryDetailBean {
this.isDelete = isDelete; this.isDelete = isDelete;
} }
public long getCreateDateTime() { public Long getCreateDateTime() {
return createDateTime; return createDateTime;
} }
public void setCreateDateTime(long createDateTime) { public void setCreateDateTime(Long createDateTime) {
this.createDateTime = createDateTime; this.createDateTime = createDateTime;
} }
public long getUpdateDateTime() { public Long getUpdateDateTime() {
return updateDateTime; return updateDateTime;
} }
public void setUpdateDateTime(long updateDateTime) { public void setUpdateDateTime(Long updateDateTime) {
this.updateDateTime = updateDateTime; this.updateDateTime = updateDateTime;
} }
...@@ -582,20 +582,20 @@ public class FactoryDetailBean { ...@@ -582,20 +582,20 @@ public class FactoryDetailBean {
*/ */
private String id; private String id;
private long createDateTime; private Long createDateTime;
private long updateDateTime; private Long updateDateTime;
private String ladleCode; private String ladleCode;
private String steelmakingWorksCode; private String steelmakingWorksCode;
private String steelmakingWorksName; private String steelmakingWorksName;
private String capacity; private String capacity;
private String temperatureRange; private String temperatureRange;
private long castingDateTime; private Long castingDateTime;
private String createUserId; private String createUserId;
private Object createUserName; private Object createUserName;
private String updateUserId; private String updateUserId;
private String updateUserName; private String updateUserName;
private Object remark; private Object remark;
private boolean delete; private Boolean delete;
public String getId() { public String getId() {
return id; return id;
...@@ -605,19 +605,19 @@ public class FactoryDetailBean { ...@@ -605,19 +605,19 @@ public class FactoryDetailBean {
this.id = id; this.id = id;
} }
public long getCreateDateTime() { public Long getCreateDateTime() {
return createDateTime; return createDateTime;
} }
public void setCreateDateTime(long createDateTime) { public void setCreateDateTime(Long createDateTime) {
this.createDateTime = createDateTime; this.createDateTime = createDateTime;
} }
public long getUpdateDateTime() { public Long getUpdateDateTime() {
return updateDateTime; return updateDateTime;
} }
public void setUpdateDateTime(long updateDateTime) { public void setUpdateDateTime(Long updateDateTime) {
this.updateDateTime = updateDateTime; this.updateDateTime = updateDateTime;
} }
...@@ -661,11 +661,11 @@ public class FactoryDetailBean { ...@@ -661,11 +661,11 @@ public class FactoryDetailBean {
this.temperatureRange = temperatureRange; this.temperatureRange = temperatureRange;
} }
public long getCastingDateTime() { public Long getCastingDateTime() {
return castingDateTime; return castingDateTime;
} }
public void setCastingDateTime(long castingDateTime) { public void setCastingDateTime(Long castingDateTime) {
this.castingDateTime = castingDateTime; this.castingDateTime = castingDateTime;
} }
...@@ -709,11 +709,11 @@ public class FactoryDetailBean { ...@@ -709,11 +709,11 @@ public class FactoryDetailBean {
this.remark = remark; this.remark = remark;
} }
public boolean isDelete() { public Boolean isDelete() {
return delete; return delete;
} }
public void setDelete(boolean delete) { public void setDelete(Boolean delete) {
this.delete = delete; this.delete = delete;
} }
} }
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ 7bd2ae8e
...@@ -245,9 +245,6 @@ public interface MesApiService { ...@@ -245,9 +245,6 @@ public interface MesApiService {
Observable<BaseMesBean> stockAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody); Observable<BaseMesBean> stockAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/** /**
* 审核接口 * 审核接口
* *
...@@ -281,4 +278,13 @@ public interface MesApiService { ...@@ -281,4 +278,13 @@ public interface MesApiService {
@GET("/himes/api/msLadleRefractoryRecord/show/{id}.json") @GET("/himes/api/msLadleRefractoryRecord/show/{id}.json")
Observable<BaseMesBean> packageDetail(@Path("id") String id, @Query("functionId") String functionId); 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 { ...@@ -134,7 +134,6 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search) @OnClick(R.id.btn_search)
public void onViewClicked() { public void onViewClicked() {
param.put("steelmakingWorksName", etKey.getText().toString()); param.put("steelmakingWorksName", etKey.getText().toString());
param.put("current", 1);
getData(); getData();
} }
...@@ -148,7 +147,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity { ...@@ -148,7 +147,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.add: case R.id.add:
startActivity(MesChooseFactoryAddActivity.class); startActivity(MesChooseFactoryAddActivity.class, "data", JSON.toJSONString(data));
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
...@@ -168,6 +167,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity { ...@@ -168,6 +167,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
@Subscribe @Subscribe
public void refresh(AddFactoryEvent event) { public void refresh(AddFactoryEvent event) {
getData();
} }
@Subscribe @Subscribe
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd2Activity.java
浏览文件 @ 7bd2ae8e
...@@ -102,21 +102,21 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity { ...@@ -102,21 +102,21 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity {
return R.layout.activity_mes_user_data_add2; return R.layout.activity_mes_user_data_add2;
} }
@Override // @Override
public boolean onCreateOptionsMenu(Menu menu) { // public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu); // getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu); // return super.onCreateOptionsMenu(menu);
} // }
//
@Override // @Override
public boolean onOptionsItemSelected(MenuItem item) { // public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { // switch (item.getItemId()) {
case R.id.finish: // case R.id.finish:
startActivity(MesUserDataAdd3Activity.class); // startActivity(MesUserDataAdd3Activity.class);
break; // break;
} // }
return super.onOptionsItemSelected(item); // return super.onOptionsItemSelected(item);
} // }
@Override @Override
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd3Activity.java
浏览文件 @ 7bd2ae8e
...@@ -147,21 +147,21 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity { ...@@ -147,21 +147,21 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
return R.layout.activity_mes_user_data_add3; return R.layout.activity_mes_user_data_add3;
} }
@Override // @Override
public boolean onCreateOptionsMenu(Menu menu) { // public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu); // getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu); // return super.onCreateOptionsMenu(menu);
} // }
//
@Override // @Override
public boolean onOptionsItemSelected(MenuItem item) { // public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { // switch (item.getItemId()) {
case R.id.finish: // case R.id.finish:
startActivity(MesChooseClientActivity.class); // startActivity(MesChooseClientActivity.class);
break; // break;
} // }
return super.onOptionsItemSelected(item); // return super.onOptionsItemSelected(item);
} // }
@Override @Override
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAddActivity.java
浏览文件 @ 7bd2ae8e
...@@ -57,21 +57,21 @@ public class MesUserDataAddActivity extends WorkToolBarActivity { ...@@ -57,21 +57,21 @@ public class MesUserDataAddActivity extends WorkToolBarActivity {
return R.layout.activity_mes_user_data_add1; return R.layout.activity_mes_user_data_add1;
} }
@Override // @Override
public boolean onCreateOptionsMenu(Menu menu) { // public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu); // getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu); // return super.onCreateOptionsMenu(menu);
} // }
//
@Override // @Override
public boolean onOptionsItemSelected(MenuItem item) { // public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { // switch (item.getItemId()) {
case R.id.finish: // case R.id.finish:
startActivity(MesUserDataAdd2Activity.class); // startActivity(MesUserDataAdd2Activity.class);
break; // break;
} // }
return super.onOptionsItemSelected(item); // return super.onOptionsItemSelected(item);
} // }
@OnClick(R.id.rl_client) @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 ...@@ -40,7 +40,7 @@ public class UserDataAdd3LabelAdapter extends BaseQuickAdapter<FactoryDetailBean
helper.setText(R.id.tv_name, item.getLadleCode()); helper.setText(R.id.tv_name, item.getLadleCode());
helper.setText(R.id.tv_content1, item.getCapacity()); helper.setText(R.id.tv_content1, item.getCapacity());
helper.setText(R.id.tv_content2, item.getTemperatureRange()); 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 @@ ...@@ -10,7 +10,6 @@
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/rl_client"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10mm" android:layout_marginTop="10mm"
...@@ -22,12 +21,12 @@ ...@@ -22,12 +21,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="客户" android:text="炼钢厂"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <EditText
android:id="@+id/tv_client" android:id="@+id/et_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -51,11 +50,12 @@ ...@@ -51,11 +50,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="销售公司" android:text="年产量"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <EditText
android:id="@+id/et_sum"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -78,10 +78,11 @@ ...@@ -78,10 +78,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="销售经理" android:text="钢种"
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <EditText
android:id="@+id/et_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -125,116 +126,23 @@ ...@@ -125,116 +126,23 @@
android:text="+添加精炼炉" android:text="+添加精炼炉"
android:textColor="@color/blue_btn" android:textColor="@color/blue_btn"
android:textSize="15sp" /> android:textSize="15sp" />
<androidx.recyclerview.widget.RecyclerView
<RelativeLayout android:id="@+id/rv_data3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10mm" 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>
<LinearLayout <TextView
android:id="@+id/tv_add3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/white" android:background="@android:color/white"
android:orientation="vertical" android:gravity="center"
android:paddingHorizontal="20mm"> android:paddingVertical="15mm"
android:text="+添加钢包"
<RelativeLayout android:textColor="@color/blue_btn"
android:layout_width="match_parent" android:textSize="15sp" />
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" />
<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 <RelativeLayout
android:id="@+id/rl_factory" android:id="@+id/rl_factory"
......
app/src/main/res/layout/item_user_add3_add.xml
浏览文件 @ 7bd2ae8e
...@@ -13,11 +13,13 @@ ...@@ -13,11 +13,13 @@
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="9mm"> android:paddingVertical="9mm">
<TextView <EditText
android:id="@+id/et_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="炼钢炉" android:background="@null"
android:hint="请输入"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
...@@ -27,6 +29,7 @@ ...@@ -27,6 +29,7 @@
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/tv_delete"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10mm" android:layout_marginRight="10mm"
...@@ -59,6 +62,7 @@ ...@@ -59,6 +62,7 @@
android:paddingLeft="25mm"> android:paddingLeft="25mm">
<TextView <TextView
android:id="@+id/tv_desc1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
...@@ -68,6 +72,7 @@ ...@@ -68,6 +72,7 @@
<EditText <EditText
android:id="@+id/et_content1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -85,6 +90,7 @@ ...@@ -85,6 +90,7 @@
android:paddingLeft="25mm"> android:paddingLeft="25mm">
<TextView <TextView
android:id="@+id/tv_desc2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
...@@ -94,6 +100,7 @@ ...@@ -94,6 +100,7 @@
<EditText <EditText
android:id="@+id/et_content2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" 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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论