Skip to content

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

1.点维修详情 

2.TODO 点维修详情测试+单独菜单
上级 0d7683d1
隐藏空白字符变更
内嵌 并排
正在显示 包含 1020 行增加 和 89 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 101cee22
......@@ -1736,13 +1736,30 @@
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.MesServiceActivity"
android:name=".ui.activity.mes.repair.MesServiceActivity"
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.repair.ServiceStandardActivity"
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.repair.ServiceStandardDetailActivity"
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.WorkOrderActivity"
android:configChanges="keyboardHidden|orientation"
......@@ -2238,7 +2255,7 @@
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.ServiceCheckDetailActivity"
android:name=".ui.activity.mes.repair.ServiceCheckDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="点检详情"
android:launchMode="singleTop"
......@@ -2246,7 +2263,7 @@
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.ServiceDetailActivity"
android:name=".ui.activity.mes.repair.ServiceDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="检修详情"
android:launchMode="singleTop"
......
app/src/main/java/com/wd/workoffice/bean/mesBean/ServiceStandardBean.java 0 → 100644
浏览文件 @ 101cee22
package com.wd.workoffice.bean.mesBean;
import com.alibaba.fastjson.annotation.JSONField;
import com.wd.workoffice.app.BaseMesPageBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class ServiceStandardBean extends BaseMesPageBean {
/**
* pageNum : 1
* pageSize : 10
* size : 0
* startRow : 0
* endRow : 0
* total : 11
* pages : 0
* list : [{"id":"69d9d1049e5f11ea8334fa163e1166bd","createDateTime":null,"updateDateTime":null,"projectId":"151aafa508a04a51a4b50c5c0d0ca0c8","checkProject":"1","processStandard":"1","remarks":"1","status":"1","numA":null,"numB":null,"numC":null,"measurementUnit":"1","description":"1","writeMethod":0,"faultId":"","delete":false,"createby":null,"changeby":null,"failureCode":null,"astFailurelist":null},{"id":"69d9d05a9e5f11ea8334fa163e1166bd","createDateTime":null,"updateDateTime":null,"projectId":"151aafa508a04a51a4b50c5c0d0ca0c8","checkProject":"1","processStandard":"1","remarks":"1","status":"0","numA":null,"numB":null,"numC":null,"measurementUnit":"1","description":"1","writeMethod":0,"faultId":"","delete":false,"createby":null,"changeby":null,"failureCode":null,"astFailurelist":null},{"id":"69d9d0c39e5f11ea8334fa163e1166bd","createDateTime":null,"updateDateTime":null,"projectId":"151aafa508a04a51a4b50c5c0d0ca0c8","checkProject":"1","processStandard":"1","remarks":"1","status":"1","numA":null,"numB":null,"numC":null,"measurementUnit":"1","description":"1","writeMethod":0,"faultId":"","delete":false,"createby":null,"changeby":null,"failureCode":null,"astFailurelist":null},{"id":"69d9d0de9e5f11ea8334fa163e1166bd","createDateTime":null,"updateDateTime":null,"projectId":"151aafa508a04a51a4b50c5c0d0ca0c8","checkProject":"1","processStandard":"1","remarks":"1","status":"1","numA":null,"numB":null,"numC":null,"measurementUnit":"1","description":"1","writeMethod":0,"faultId":"c0a48d9fa3d811ea8334fa163e1166bd","delete":false,"createby":null,"changeby":null,"failureCode":"GZ20060110006","astFailurelist":null},{"id":"69d9d0f29e5f11ea8334fa163e1166bd","createDateTime":null,"updateDateTime":null,"projectId":"151aafa508a04a51a4b50c5c0d0ca0c8","checkProject":"1","processStandard":"1","remarks":"1","status":"1","numA":14,"numB":41,"numC":414,"measurementUnit":"1","description":"1","writeMethod":0,"faultId":"3781142fa47011ea8334fa163e1166bd","delete":false,"createby":null,"changeby":null,"failureCode":"GZ20060210002","astFailurelist":null},{"id":"69d9d1189e5f11ea8334fa163e1166bd","createDateTime":null,"updateDateTime":null,"projectId":"151aafa508a04a51a4b50c5c0d0ca0c8","checkProject":"1","processStandard":"1","remarks":"1","status":"1","numA":null,"numB":null,"numC":null,"measurementUnit":"1","description":"1","writeMethod":0,"faultId":"","delete":false,"createby":null,"changeby":null,"failureCode":null,"astFailurelist":null},{"id":"69d9d12b9e5f11ea8334fa163e1166bd","createDateTime":null,"updateDateTime":null,"projectId":"151aafa508a04a51a4b50c5c0d0ca0c8","checkProject":"1","processStandard":"1","remarks":"1","status":"1","numA":null,"numB":null,"numC":null,"measurementUnit":"1","description":"1","writeMethod":0,"faultId":"","delete":false,"createby":null,"changeby":null,"failureCode":null,"astFailurelist":null},{"id":"69d9d13d9e5f11ea8334fa163e1166bd","createDateTime":null,"updateDateTime":null,"projectId":"151aafa508a04a51a4b50c5c0d0ca0c8","checkProject":"1","processStandard":"1","remarks":"1","status":"1","numA":2,"numB":2,"numC":2,"measurementUnit":"1","description":"1","writeMethod":0,"faultId":"","delete":false,"createby":null,"changeby":null,"failureCode":null,"astFailurelist":null},{"id":"69d9d14e9e5f11ea8334fa163e1166bd","createDateTime":null,"updateDateTime":null,"projectId":"151aafa508a04a51a4b50c5c0d0ca0c8","checkProject":"1","processStandard":"1","remarks":"1","status":"1","numA":null,"numB":null,"numC":null,"measurementUnit":"1","description":"1","writeMethod":0,"faultId":"","delete":false,"createby":null,"changeby":null,"failureCode":null,"astFailurelist":null},{"id":"69d9d15e9e5f11ea8334fa163e1166bd","createDateTime":null,"updateDateTime":null,"projectId":"151aafa508a04a51a4b50c5c0d0ca0c8","checkProject":"1","processStandard":"1","remarks":"1","status":"1","numA":null,"numB":null,"numC":null,"measurementUnit":"1","description":"1","writeMethod":0,"faultId":"","delete":false,"createby":null,"changeby":null,"failureCode":null,"astFailurelist":null}]
* prePage : 0
* nextPage : 0
* isFirstPage : false
* isLastPage : false
* hasPreviousPage : false
* hasNextPage : false
* navigatePages : 0
* navigatepageNums : null
* navigateFirstPage : 0
* navigateLastPage : 0
* firstPage : 0
* lastPage : 0
*/
private List<ListBean> list;
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public static class ListBean {
/**
* id : 69d9d1049e5f11ea8334fa163e1166bd
* createDateTime : null
* updateDateTime : null
* projectId : 151aafa508a04a51a4b50c5c0d0ca0c8
* checkProject : 1
* processStandard : 1
* remarks : 1
* status : 1
* numA : null
* numB : null
* numC : null
* measurementUnit : 1
* description : 1
* writeMethod : 0
* faultId :
* delete : false
* createby : null
* changeby : null
* failureCode : null
* astFailurelist : null
*/
private String id;
private String createDateTime;
private String updateDateTime;
private String projectId;
private String checkProject;
private String processStandard;
private String remarks;
private String status;
private String numA;
private String numB;
private String numC;
private String measurementUnit;
private String description;
private int writeMethod;
private String faultId;
private boolean delete;
private String createby;
private String changeby;
private String failureCode;
private String astFailurelist;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(String createDateTime) {
this.createDateTime = createDateTime;
}
public String getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(String updateDateTime) {
this.updateDateTime = updateDateTime;
}
public String getProjectId() {
return projectId;
}
public void setProjectId(String projectId) {
this.projectId = projectId;
}
public String getCheckProject() {
return checkProject;
}
public void setCheckProject(String checkProject) {
this.checkProject = checkProject;
}
public String getProcessStandard() {
return processStandard;
}
public void setProcessStandard(String processStandard) {
this.processStandard = processStandard;
}
public String getRemarks() {
return remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getNumA() {
return numA;
}
public void setNumA(String numA) {
this.numA = numA;
}
public String getNumB() {
return numB;
}
public void setNumB(String numB) {
this.numB = numB;
}
public String getNumC() {
return numC;
}
public void setNumC(String numC) {
this.numC = numC;
}
public String getMeasurementUnit() {
return measurementUnit;
}
public void setMeasurementUnit(String measurementUnit) {
this.measurementUnit = measurementUnit;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public int getWriteMethod() {
return writeMethod;
}
public void setWriteMethod(int writeMethod) {
this.writeMethod = writeMethod;
}
public String getFaultId() {
return faultId;
}
public void setFaultId(String faultId) {
this.faultId = faultId;
}
public boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
this.delete = delete;
}
public String getCreateby() {
return createby;
}
public void setCreateby(String createby) {
this.createby = createby;
}
public String getChangeby() {
return changeby;
}
public void setChangeby(String changeby) {
this.changeby = changeby;
}
public String getFailureCode() {
return failureCode;
}
public void setFailureCode(String failureCode) {
this.failureCode = failureCode;
}
public String getAstFailurelist() {
return astFailurelist;
}
public void setAstFailurelist(String astFailurelist) {
this.astFailurelist = astFailurelist;
}
}
}
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ 101cee22
......@@ -581,6 +581,13 @@ public interface MesApiService {
@POST("/himes/api/spotCheckBill/show/page.json")
Observable<BaseMesBean> spotCheckBillList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/spotCheckBill/show/spotCheckBillStandard.json")
Observable<BaseMesBean> spotCheckStandardList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/MesServiceActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/MesServiceActivity.java
浏览文件 @ 101cee22
package com.wd.workoffice.ui.activity.mes;
package com.wd.workoffice.ui.activity.mes.repair;
import android.os.Bundle;
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ServiceCheckDetailActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceCheckDetailActivity.java
浏览文件 @ 101cee22
package com.wd.workoffice.ui.activity.mes;
package com.wd.workoffice.ui.activity.mes.repair;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
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.Config;
......@@ -27,6 +29,8 @@ import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
*
* 点检详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......@@ -102,7 +106,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
private void changeView() {
tvNo.setText(info.getBillNum());
tvStatus.setText(info.getStatus() + "");
tvStatus.setText(info.getStatus() == 1 ? "已点检" : "未点检");
tvPerson.setText(info.getSpotCheckPersonName());
tvNewPerson.setText(info.getCreateUserName());
tvNewTime.setText(info.getCreateDateTime());
......@@ -189,6 +193,12 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
param.put("pageNum", page);
getData();
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
startActivity(ServiceStandardActivity.class,"id",JSON.toJSONString(dataList.get(i).getId()));
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ServiceDetailActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceDetailActivity.java
浏览文件 @ 101cee22
package com.wd.workoffice.ui.activity.mes;
package com.wd.workoffice.ui.activity.mes.repair;
import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
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.Config;
......@@ -85,7 +88,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
@Override
protected void initData() {
info = JSON.parseObject(getIntent().getStringExtra("info"),ServiceBean.ListBean.class);
info = JSON.parseObject(getIntent().getStringExtra("info"), ServiceBean.ListBean.class);
changeView();
dataList = new ArrayList<>();
dataAdapter = new MesServiceDetailAdapter(R.layout.item_mes_service, dataList);
......@@ -100,7 +103,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
private void changeView() {
tvNo.setText(info.getInspoCode());
tvStatus.setText(info.getStatus() + "");
tvStatus.setText(info.getStatus() == 1 ? "未维修" : "已检修");
tvPerson.setText(info.getPrincipalName());
tvPlan.setText(info.getPlanDesc());
tvLocation.setText(info.getLocationName());
......@@ -117,7 +120,6 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
}
private void getData() {
RtfUtils.getMesRtf().modinspoproject("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
......@@ -163,6 +165,12 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
param.put("pageNum", page);
getData();
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
startActivity(ServiceStandardActivity.class, "id", JSON.toJSONString(dataList.get(i).getId()));
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceStandardActivity.java 0 → 100644
浏览文件 @ 101cee22
package com.wd.workoffice.ui.activity.mes.repair;
import android.view.View;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.ServiceStandardBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesServiceStandardAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
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 ServiceStandardActivity extends WorkToolBarActivity {
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private Map<String, Object> param;
private List<ServiceStandardBean.ListBean> dataList;
private MesServiceStandardAdapter dataAdapter;
private int page = 1;
@Override
protected void initView() {
ButterKnife.bind(this);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new MesServiceStandardAdapter(R.layout.item_mes_service_standard, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.simpleParam();
param.put("projectId", getIntent().getStringExtra("id"));
getData();
}
private void getData() {
RtfUtils.getMesRtf().spotCheckStandardList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
List<ServiceStandardBean.ListBean> getList = JSON.parseObject(data.getData().toString(), ServiceStandardBean.class).getList();
if (page == 1) {
dataList.clear();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
srlRefresh.finishRefresh();
} else {
dataAdapter.loadMoreComplete();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
dataAdapter.loadMoreEnd();
} else {
page++;
}
}
});
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(new OnRefreshListener() {
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
page = 1;
param.put("pageNum", 1);
getData();
}
});
dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("pageNum", page);
getData();
}
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
startActivity(ServiceStandardDetailActivity.class, "info", JSON.toJSONString(dataList.get(i)));
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_pro_price;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceStandardDetailActivity.java 0 → 100644
浏览文件 @ 101cee22
package com.wd.workoffice.ui.activity.mes.repair;
import android.text.TextUtils;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.ServiceStandardBean;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class ServiceStandardDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_process_standard)
TextView tvProcessStandard;
@BindView(R.id.tv_num_a)
TextView tvNumA;
@BindView(R.id.tv_num_b)
TextView tvNumB;
@BindView(R.id.tv_num_c)
TextView tvNumC;
@BindView(R.id.tv_measurement_unit)
TextView tvMeasurementUnit;
@BindView(R.id.tv_status)
TextView tvStatus;
@BindView(R.id.tv_failure_code)
TextView tvFailureCode;
@BindView(R.id.tv_desc)
TextView tvDesc;
@BindView(R.id.tv_remark)
TextView tvRemark;
private ServiceStandardBean.ListBean info;
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
info = JSON.parseObject(getIntent().getStringExtra("info"), ServiceStandardBean.ListBean.class);
changeView();
}
private void changeView() {
tvDesc.setText(info.getDescription());
tvFailureCode.setText(info.getFailureCode());
tvMeasurementUnit.setText(info.getMeasurementUnit());
tvNumA.setText(info.getNumA());
tvNumB.setText(info.getNumB());
tvNumC.setText(info.getNumC());
tvProcessStandard.setText(info.getProcessStandard());
tvStatus.setText(TextUtils.equals(info.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
tvRemark.setText(info.getRemarks());
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_service_standard_detail;
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesServiceStandardAdapter.java 0 → 100644
浏览文件 @ 101cee22
package com.wd.workoffice.ui.adapter;
import android.text.TextUtils;
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.LogBean;
import com.wd.workoffice.bean.mesBean.ServiceStandardBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class MesServiceStandardAdapter extends BaseQuickAdapter<ServiceStandardBean.ListBean, BaseViewHolder> {
public MesServiceStandardAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, ServiceStandardBean.ListBean item) {
helper.setText(R.id.tv_name, String.format("检查项目:%s",item.getCheckProject()));
helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(),"1")?"异常":"正常");//1 异常 0正常
helper.setText(R.id.tv_content1, item.getProcessStandard());
helper.setText(R.id.tv_content2, item.getMeasurementUnit());
helper.setText(R.id.tv_content3, item.getFailureCode());
}
}
app/src/main/java/com/wd/workoffice/ui/fg/MesCheckFragment.java
浏览文件 @ 101cee22
......@@ -15,7 +15,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.mesBean.ServiceCheckBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.ServiceCheckDetailActivity;
import com.wd.workoffice.ui.activity.mes.repair.ServiceCheckDetailActivity;
import com.wd.workoffice.ui.adapter.MesCheckAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
......@@ -39,6 +39,7 @@ import io.reactivex.disposables.Disposable;
/**
* 点检
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......
app/src/main/java/com/wd/workoffice/ui/fg/MesFragment.java
浏览文件 @ 101cee22
......@@ -7,13 +7,9 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.vo.BatLayoutVo;
import com.wd.workoffice.ui.activity.mes.MesFeedbackActivity;
import com.wd.workoffice.ui.activity.mes.MesScrappedActivity;
import com.wd.workoffice.ui.activity.mes.MesServiceActivity;
import com.wd.workoffice.ui.activity.mes.repair.MesServiceActivity;
import com.wd.workoffice.ui.activity.mes.QualityTraceabilityActivity;
import com.wd.workoffice.ui.activity.mes.analysis.MesAnalysisActivity;
import com.wd.workoffice.ui.activity.mes.order.MesOrderActivity;
import com.wd.workoffice.ui.activity.mes.MesProcessActivity;
import com.wd.workoffice.ui.activity.mes.order.MesOrderProcessActivity;
import com.wd.workoffice.ui.activity.mes.report.MesReportActivity;
import com.wd.workoffice.ui.activity.mes.ticket.MesTicketActivity;
......
app/src/main/java/com/wd/workoffice/ui/fg/MesServiceFragment.java
浏览文件 @ 101cee22
......@@ -15,8 +15,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.mesBean.ServiceBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.ServiceCheckDetailActivity;
import com.wd.workoffice.ui.activity.mes.ServiceDetailActivity;
import com.wd.workoffice.ui.activity.mes.repair.ServiceDetailActivity;
import com.wd.workoffice.ui.adapter.MesServiceAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
......@@ -40,6 +39,7 @@ import io.reactivex.disposables.Disposable;
/**
* 维修
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......
app/src/main/res/layout/activity_mes_service_standard_detail.xml 0 → 100644
浏览文件 @ 101cee22
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:orientation="vertical"
android:paddingBottom="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="工艺标准"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_process_standard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="数值A"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_num_a"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="数值B"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_num_b"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="数值C"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_num_c"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="计量单位"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_measurement_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="状态"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设备故障活故障代码"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_failure_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="描述"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
<View style="@style/dividerX" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="备注"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
app/src/main/res/layout/item_mes_service.xml
浏览文件 @ 101cee22
......@@ -6,9 +6,9 @@
android:layout_margin="8mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="10mm">
android:paddingHorizontal="10mm"
android:paddingVertical="10mm"
>
......@@ -17,11 +17,11 @@
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:paddingHorizontal="10mm">
......@@ -43,5 +43,11 @@
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_mes_service_check.xml
浏览文件 @ 101cee22
......@@ -6,10 +6,8 @@
android:layout_margin="8mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="10mm">
android:paddingHorizontal="10mm"
android:paddingVertical="10mm">
<LinearLayout
......@@ -17,79 +15,94 @@
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingHorizontal="10mm">
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="设备"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_machine"
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="位置"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="设备"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:id="@+id/tv_machine"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="点检项目"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:id="@+id/tv_check_project"
android:layout_width="wrap_content"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="位置"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="点检项目"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_check_project"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_mes_service_standard.xml 0 → 100644
浏览文件 @ 101cee22
<?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="wrap_content"
android:layout_centerHorizontal="true"
android:layout_margin="8mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="10mm"
android:paddingVertical="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="设备"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/orange"
android:textSize="13sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="工艺标准"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_content1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="计量单位"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_content2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="缺陷或故障编码"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_content3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论