Skip to content

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

1.質量反饋新增 

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.
差两个产品关联，支数参数
上级 7ef0710f
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 771 行增加 和 8 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ c347170a
......@@ -1716,6 +1716,30 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.quality.MesChooseMachineActivity"
android:configChanges="keyboardHidden|orientation"
android:label="选择连铸机"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> <activity
android:name=".ui.activity.mes.quality.MesChooseBoxActivity"
android:configChanges="keyboardHidden|orientation"
android:label="选择箱号"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.quality.MesChooseDefectActivity"
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"
android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/bean/mesBean/DefectBean.java 0 → 100644
浏览文件 @ c347170a
package com.wd.workoffice.bean.mesBean;
import com.wd.workoffice.app.BaseMesPageBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class DefectBean extends BaseMesPageBean {
/**
* pageNum : 1
* pageSize : 10
* size : 10
* startRow : 1
* endRow : 10
* total : 32
* pages : 4
* list : [{"id":"214a5a0e8d1211ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1588491959000,"updateDateTime":1588491959000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2005001","defectName":"3333333","productClassType":"1","mainCause":"3333333333333333333333","severity":6,"detectionValue":9,"enable":true,"remark":"3333333333333333333333"},{"id":"2c7b57a2755211ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585880638000,"updateDateTime":1585880638000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2004004","defectName":"1111","productClassType":"1","mainCause":null,"severity":2,"detectionValue":null,"enable":true,"remark":null},{"id":"03d8070d755111ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585880140000,"updateDateTime":1585880140000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2004003","defectName":"111","productClassType":"1","mainCause":null,"severity":3,"detectionValue":2,"enable":true,"remark":null},{"id":"428d5da6725911ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585553828000,"updateDateTime":1585553828000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003012","defectName":"测试数据","productClassType":"0","mainCause":"测试","severity":1,"detectionValue":1,"enable":true,"remark":"测试"},{"id":"b57923256f3311ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585207846000,"updateDateTime":1585207846000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003011","defectName":"33","productClassType":"0","mainCause":"33","severity":6,"detectionValue":1,"enable":true,"remark":"33"},{"id":"9f09994d6f3311ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585207809000,"updateDateTime":1585207809000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003010","defectName":"20","productClassType":"2","mainCause":null,"severity":5,"detectionValue":null,"enable":true,"remark":null},{"id":"8d9c16136f3311ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585207779000,"updateDateTime":1585207779000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003009","defectName":"11","productClassType":"0","mainCause":null,"severity":1,"detectionValue":null,"enable":true,"remark":null},{"id":"bb6ef9e26f3111ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585206997000,"updateDateTime":1585206997000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003008","defectName":"444","productClassType":"1","mainCause":"44","severity":2,"detectionValue":2,"enable":true,"remark":"77"},{"id":"a99c9a616f3111ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585206967000,"updateDateTime":1585206967000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003002","defectName":"444","productClassType":"1","mainCause":"44","severity":2,"detectionValue":2,"enable":true,"remark":"77"},{"id":"8b6ea59d6f3111ea8334fa163e1166bd","delete":false,"createUserId":"398c852b38e911ea8334fa163e1166bd","updateUserId":"398c852b38e911ea8334fa163e1166bd","createDateTime":1585206917000,"updateDateTime":1585206917000,"createbyName":"hello","updateByName":"hello","defectCode":"QX2003001","defectName":"123","productClassType":"1","mainCause":"1","severity":2,"detectionValue":2,"enable":true,"remark":"1"}]
* prePage : 0
* nextPage : 2
* isFirstPage : true
* isLastPage : false
* hasPreviousPage : false
* hasNextPage : true
* navigatePages : 8
* navigatepageNums : [1,2,3,4]
* navigateFirstPage : 1
* navigateLastPage : 4
* firstPage : 1
* lastPage : 4
*/
private List<ListBean> list;
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public static class ListBean {
/**
* id : 214a5a0e8d1211ea8334fa163e1166bd
* delete : false
* createUserId : 398c852b38e911ea8334fa163e1166bd
* updateUserId : 398c852b38e911ea8334fa163e1166bd
* createDateTime : 1588491959000
* updateDateTime : 1588491959000
* createbyName : hello
* updateByName : hello
* defectCode : QX2005001
* defectName : 3333333
* productClassType : 1
* mainCause : 3333333333333333333333
* severity : 6
* detectionValue : 9
* enable : true
* remark : 3333333333333333333333
*/
private String id;
private boolean delete;
private String createUserId;
private String updateUserId;
private long createDateTime;
private long updateDateTime;
private String createbyName;
private String updateByName;
private String defectCode;
private String defectName;
private String productClassType;
private String mainCause;
private int severity;
private int detectionValue;
private boolean enable;
private String remark;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
this.delete = delete;
}
public String getCreateUserId() {
return createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public long getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(long createDateTime) {
this.createDateTime = createDateTime;
}
public long getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(long updateDateTime) {
this.updateDateTime = updateDateTime;
}
public String getCreatebyName() {
return createbyName;
}
public void setCreatebyName(String createbyName) {
this.createbyName = createbyName;
}
public String getUpdateByName() {
return updateByName;
}
public void setUpdateByName(String updateByName) {
this.updateByName = updateByName;
}
public String getDefectCode() {
return defectCode;
}
public void setDefectCode(String defectCode) {
this.defectCode = defectCode;
}
public String getDefectName() {
return defectName;
}
public void setDefectName(String defectName) {
this.defectName = defectName;
}
public String getProductClassType() {
return productClassType;
}
public void setProductClassType(String productClassType) {
this.productClassType = productClassType;
}
public String getMainCause() {
return mainCause;
}
public void setMainCause(String mainCause) {
this.mainCause = mainCause;
}
public int getSeverity() {
return severity;
}
public void setSeverity(int severity) {
this.severity = severity;
}
public int getDetectionValue() {
return detectionValue;
}
public void setDetectionValue(int detectionValue) {
this.detectionValue = detectionValue;
}
public boolean isEnable() {
return enable;
}
public void setEnable(boolean enable) {
this.enable = enable;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
}
app/src/main/java/com/wd/workoffice/bean/mesBean/FeedbackDetailBean.java
浏览文件 @ c347170a
......@@ -115,7 +115,7 @@ public class FeedbackDetailBean {
private String mainCause;
private Object defectCount;
private Object defectCounts;
private Object steelTypeId;
private String steelTypeId;
private String steelTypeName;
private String feedbackDescription;
private String otherProviderBehavior;
......@@ -381,11 +381,11 @@ public class FeedbackDetailBean {
this.defectCounts = defectCounts;
}
public Object getSteelTypeId() {
public String getSteelTypeId() {
return steelTypeId;
}
public void setSteelTypeId(Object steelTypeId) {
public void setSteelTypeId(String steelTypeId) {
this.steelTypeId = steelTypeId;
}
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ c347170a
......@@ -336,4 +336,35 @@ public interface MesApiService {
@POST("/himes/api/user/show/page.json")
Observable<BaseMesBean> managerList( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 销售经理查询
*
* @return
*/
@POST("/himes/api/feedback/show/conster/list.json")
Observable<BaseMesBean> machineByUser( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 获取箱码接口
*
* @return
*/
@POST("/himes/api/mpsProduct/show/getMpsProduct/list.json")
Observable<BaseMesBean> boxNum( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 获取箱码接口
*
* @return
*/
@POST("/himes/api/defectdict/show/page.json")
Observable<BaseMesBean> defectList( @Query("functionId") String functionId, @Body RequestBody requestBody);
/**
*
* @return
*/
@POST("/himes/api/feedback/add/save.json")
Observable<BaseMesBean> feedbackAdd( @Query("functionId") String functionId, @Body RequestBody requestBody);
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesChooseBoxActivity.java 0 → 100644
浏览文件 @ c347170a
package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
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.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.BoxBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.user.MesUserDataAdd2Activity;
import com.wd.workoffice.ui.adapter.ChooseBoxAdapter;
import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
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 io.reactivex.disposables.Disposable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesChooseBoxActivity extends WorkToolBarActivity {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.btn_search)
Button btnSearch;
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<BoxBean> clientList;
private ChooseBoxAdapter clientAdapter;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
etKey.setHint("搜索产品名");
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new ChooseBoxAdapter(R.layout.item_user_data_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.simpleParam();
paramMap = WorkUtils.simpleParam();
paramMap.put("custCode", getIntent().getStringExtra("code"));
param.put("paramMap", paramMap);
getData();
}
private void getData() {
RtfUtils.getMesRtf().boxNum("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;
}
List<BoxBean> getList = JSON.parseArray(data.getData().toString(), BoxBean.class);
clientList.clear();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
toast("搜索成功");
}
});
}
@Override
protected void initEvent() {
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10001, intent);
finish();
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_bat_sale_client;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("productName", etKey.getText().toString());
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesChooseDefectActivity.java 0 → 100644
浏览文件 @ c347170a
package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
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.mesBean.DefectBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesDefectAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
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 io.reactivex.disposables.Disposable;
/**
* 选择客户
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesChooseDefectActivity extends WorkToolBarActivity {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.btn_search)
Button btnSearch;
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<DefectBean.ListBean> clientList;
private MesDefectAdapter clientAdapter;
private int page = 1;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
etKey.setHint("搜索缺陷名");
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new MesDefectAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
paramMap.put("productClassType", "");
param.put("paramMap", paramMap);
param.put("pageNum", 1);
getData();
}
private void getData() {
RtfUtils.getMesRtf().defectList("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;
}
List<DefectBean.ListBean> getList = JSON.parseObject(data.getData().toString(), DefectBean.class).getList();
if (page == 1) {
clientList.clear();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
clientAdapter.loadMoreComplete();
} else {
clientAdapter.loadMoreComplete();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
clientAdapter.loadMoreEnd();
} else {
page++;
}
toast("搜索成功");
}
});
}
@Override
protected void initEvent() {
clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("pageNum", page);
getData();
}
}, rvClient);
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10001, intent);
finish();
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_ticket_take_on;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("defectName", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesChooseMachineActivity.java 0 → 100644
浏览文件 @ c347170a
package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
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.mesBean.ChooseMachineBean;
import com.wd.workoffice.bean.mesBean.ManagerUserBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesChooseMachinerAdapter;
import com.wd.workoffice.ui.adapter.MesManagerAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
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 io.reactivex.disposables.Disposable;
/**
* 销售经理查询
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesChooseMachineActivity extends WorkToolBarActivity {
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<ChooseMachineBean> clientList;
private MesChooseMachinerAdapter clientAdapter;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new MesChooseMachinerAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.simpleParam();
paramMap = WorkUtils.simpleParam();
paramMap.put("custCode",getIntent().getStringExtra("code"));
param.put("paramMap", paramMap);
getData();
}
private void getData() {
RtfUtils.getMesRtf().machineByUser("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;
}
List<ChooseMachineBean> getList = JSON.parseArray(data.getData().toString(), ChooseMachineBean.class);
clientList.clear();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
toast("搜索成功");
}
});
}
@Override
protected void initEvent() {
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10001, intent);
finish();
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_choose_machine;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDetailActivity.java
浏览文件 @ c347170a
......@@ -203,7 +203,7 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
tvNum.setText(detailBean.getVerson());
tvMarkCode.setText(detailBean.getSerialNumber());
tvMachine.setText(detailBean.getCasterName());
tvSteelType.setText(detailBean.getSteelTypeName());
tvSteelType.setText(detailBean.getSteelTypeId());
tvDefect.setText(detailBean.getDefectName());
tvDefectReason.setText(detailBean.getMainCause());
//二、销售经理反馈信息
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketClientActivity.java
浏览文件 @ c347170a
......@@ -47,6 +47,7 @@ public class MesTicketClientActivity extends WorkToolBarActivity {
private List<MesClientBean.ListBean> clientList;
private MesClientAdapter clientAdapter;
private int page = 1;
private Map<String, Object> paramMap;
@Override
protected void initView() {
......@@ -64,8 +65,10 @@ public class MesTicketClientActivity extends WorkToolBarActivity {
clientAdapter = new MesClientAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
paramMap = WorkUtils.simpleParam();
param = WorkUtils.pageMesKey();
param.put("pageNum", 1);
param.put("paramMap",paramMap);
getData();
}
......@@ -137,7 +140,7 @@ public class MesTicketClientActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search)
public void onViewClicked() {
param.put("name", etKey.getText().toString());
paramMap.put("customerName", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.java
浏览文件 @ c347170a
......@@ -60,6 +60,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
private List<FactoryBean> clientList;
private UserDataFactorytAdapter clientAdapter;
private UserDataBean.ListBean data;
private Map<String, Object> paramMap;
@Override
protected void initView() {
......@@ -76,7 +77,9 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
clientAdapter = new UserDataFactorytAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
paramMap = WorkUtils.simpleParam();
param = WorkUtils.pageKey();
param.put("paramMap", paramMap);
getData();
}
......@@ -140,7 +143,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search)
public void onViewClicked() {
param.put("steelmakingWorksName", etKey.getText().toString());
paramMap.put("steelmakingWorksName", etKey.getText().toString());
getData();
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineActivity.java
浏览文件 @ c347170a
......@@ -60,7 +60,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
private List<MachineBean> clientList;
private UserDataChooseMachineAdapter clientAdapter;
private UserDataBean.ListBean data;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
......@@ -75,7 +75,9 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
clientAdapter = new UserDataChooseMachineAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
paramMap = WorkUtils.simpleParam();
param = WorkUtils.simpleParam();
param.put("paramMap", paramMap);
param.put("steelmakingWorksCode", data.getSteelmakingWorksCode());
getData();
}
......@@ -136,7 +138,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
@OnClick(R.id.btn_search)
public void onViewClicked() {
param.put("continuousCasterName", etKey.getText().toString());
paramMap.put("continuousCasterName", etKey.getText().toString());
getData();
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/ChooseBoxAdapter.java 0 → 100644
浏览文件 @ c347170a
package com.wd.workoffice.ui.adapter;
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.BoxBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class ChooseBoxAdapter extends BaseQuickAdapter<BoxBean, BaseViewHolder> {
public ChooseBoxAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, BoxBean item) {
helper.setText(R.id.tv_name, item.getBoxId());
helper.setText(R.id.tv_person, item.getProductCode());
helper.setText(R.id.tv_sale, item.getProductName());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesChooseMachinerAdapter.java 0 → 100644
浏览文件 @ c347170a
package com.wd.workoffice.ui.adapter;
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.ChooseMachineBean;
import com.wd.workoffice.bean.mesBean.ManagerUserBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class MesChooseMachinerAdapter extends BaseQuickAdapter<ChooseMachineBean, BaseViewHolder> {
public MesChooseMachinerAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, ChooseMachineBean item) {
helper.setText(R.id.tv_name, item.getCasterName());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesDefectAdapter.java 0 → 100644
浏览文件 @ c347170a
package com.wd.workoffice.ui.adapter;
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.DefectBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class MesDefectAdapter extends BaseQuickAdapter<DefectBean.ListBean, BaseViewHolder> {
public MesDefectAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, DefectBean.ListBean item) {
helper.setText(R.id.tv_name, item.getDefectName());
}
}
app/src/main/res/layout/activity_mes_choose_machine.xml 0 → 100644
浏览文件 @ c347170a
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_client"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="4mm">
</androidx.recyclerview.widget.RecyclerView>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论