Skip to content

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

1.故障 

2.TODO 单独菜单
上级 22f51660
隐藏空白字符变更
内嵌 并排
正在显示 包含 506 行增加 和 7 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/FaultBean.java 0 → 100644
浏览文件 @ e4353837
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 FaultBean extends BaseMesPageBean {
private List<ListBean> list;
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public static class ListBean {
/**
* id : b3e8232b851c468da33134dc07307e23
* createDateTime : 1597975766000
* updateDateTime : null
* woId : 570f78e7e1cb11ea8334fa163e1166bd
* failureId : 1dead3c0902c11ea8334fa163e1166bd
* failureCode : F00043
* failureName : 1
* createBy : 398c852b38e911ea8334fa163e1166bd
* changeBy : null
* parentId : null
* delete : false
*/
private String id;
private long createDateTime;
private Object updateDateTime;
private String woId;
private String failureId;
private String failureCode;
private String failureName;
private String createBy;
private Object changeBy;
private Object parentId;
private boolean delete;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public long getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(long createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(Object updateDateTime) {
this.updateDateTime = updateDateTime;
}
public String getWoId() {
return woId;
}
public void setWoId(String woId) {
this.woId = woId;
}
public String getFailureId() {
return failureId;
}
public void setFailureId(String failureId) {
this.failureId = failureId;
}
public String getFailureCode() {
return failureCode;
}
public void setFailureCode(String failureCode) {
this.failureCode = failureCode;
}
public String getFailureName() {
return failureName;
}
public void setFailureName(String failureName) {
this.failureName = failureName;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Object getChangeBy() {
return changeBy;
}
public void setChangeBy(Object changeBy) {
this.changeBy = changeBy;
}
public Object getParentId() {
return parentId;
}
public void setParentId(Object parentId) {
this.parentId = parentId;
}
public boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
this.delete = delete;
}
}
}
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ e4353837
......@@ -748,6 +748,13 @@ public interface MesApiService {
*/
@POST("/himes/api/workOrder/show/pageActivity.json")
Observable<BaseMesBean> pageActivity(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 质量工单-计划-故障
*
* @return
*/
@POST("/himes/api/workOrder/show/pageFailure.json")
Observable<BaseMesBean> pageFailure(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkFaultFragment.java 0 → 100644
浏览文件 @ e4353837
package com.wd.workoffice.ui.activity.mes.work;
import android.os.Bundle;
import android.view.View;
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.WorkBaseFg;
import com.wd.workoffice.bean.mesBean.FaultBean;
import com.wd.workoffice.bean.mesBean.WokrOrderBean;
import com.wd.workoffice.bean.mesBean.WorkOrderSon;
import com.wd.workoffice.bean.mesBean.WorkTaskBean;
import com.wd.workoffice.bean.workEnum.WorkOrder;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkOrderFaultAdapter;
import com.wd.workoffice.ui.adapter.WorkOrderSonAdapter;
import com.wd.workoffice.ui.adapter.WorkOrderTaskAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import 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 QualityWorkFaultFragment extends WorkBaseFg {
@BindView(R.id.tv_no)
TextView tvNo;
@BindView(R.id.tv_desc)
TextView tvDesc;
@BindView(R.id.rv_data)
RecyclerView rvData;
private List<FaultBean.ListBean> taskList;
private WorkOrderFaultAdapter taskAdapter;
private WokrOrderBean.ListBean info;
private int page = 1;
private int taskPage = 1;
private Map<String, Object> taskParam;
private Map<String, Object> taskParamMap;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Bundle arguments = getArguments();
if (arguments != null) {
info = JSON.parseObject(arguments.getString("info"), WokrOrderBean.ListBean.class);
}
}
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
rvData.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
// tvNo.setText(info.getWoCode());
// tvDesc.setText(info.getDescription());
taskList = new ArrayList<>();
taskAdapter = new WorkOrderFaultAdapter(R.layout.item_work_order_fault, taskList);
taskAdapter.bindToRecyclerView(rvData);
taskParam = WorkUtils.pageMesKey();
taskParam.put("pageNum", 1);
taskParamMap = WorkUtils.simpleParam();
taskParam.put("paramMap", taskParamMap);
taskParamMap.put("woId", info.getId());
getTask();
}
private void getTask() {
RtfUtils.getMesRtf().pageFailure("1", WorkUtils.convertMapToBody(taskParam)).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<FaultBean.ListBean> getList = JSON.parseObject(data.getData().toString(), FaultBean.class).getList();
if (taskPage == 1) {
taskList.clear();
taskList.addAll(getList);
taskAdapter.notifyDataSetChanged();
taskAdapter.loadMoreComplete();
} else {
taskAdapter.loadMoreComplete();
taskList.addAll(getList);
taskAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
taskAdapter.loadMoreEnd(true);
} else {
taskPage++;
}
}
});
}
@Override
protected void initEvent() {
taskAdapter.setOnLoadMoreListener(() -> {
taskParam.put("pageNum", taskPage);
getTask();
}, rvData);
// taskAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
// @Override
// public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// startActivity(WorkTaskDetailActivity.class,
// "plan", "0", "info", JSON.toJSONString(taskList.get(position)));
// }
// });
}
@Override
protected int layoutId() {
return R.layout.fg_work_order_detail_fault;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkOrderDetailActivity.java
浏览文件 @ e4353837
......@@ -51,10 +51,11 @@ public class WorkOrderDetailActivity extends WorkToolBarActivity {
QualityWorkFragment qualityWorkFragment = new QualityWorkFragment();
QualityWorkPlanFragment qualityWorkPlanFragment = new QualityWorkPlanFragment();
QualityWorkTrueFragment qualityWorkTrueFragment = new QualityWorkTrueFragment();
QualityWorkFaultFragment qualityWorkFaultFragment =new QualityWorkFaultFragment();
qualityWorkFragment.setArguments(bundle);
qualityWorkPlanFragment.setArguments(bundle);
qualityWorkTrueFragment.setArguments(bundle);
qualityWorkFaultFragment.setArguments(bundle);
data.add(qualityWorkFragment);
data.add(qualityWorkPlanFragment);
tab.add("工单");
......@@ -63,11 +64,8 @@ public class WorkOrderDetailActivity extends WorkToolBarActivity {
tab.add("实际情况");
data.add(qualityWorkTrueFragment);
}
//TODO 故障报告
// tab.add("故障报告");
// data.add(qualityWorkFragment);
// data.add(qualityWorkFragment);
tab.add("故障报告");
data.add(qualityWorkFaultFragment);
VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
vpData.setAdapter(vpFgAdapter);
for (int i = 0; i < tab.size(); i++) {
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkOrderFaultAdapter.java 0 → 100644
浏览文件 @ e4353837
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.FaultBean;
import com.wd.workoffice.bean.mesBean.WorkTaskBean;
import com.wd.workoffice.bean.workEnum.WorkOrder;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkOrderFaultAdapter extends BaseQuickAdapter<FaultBean.ListBean, BaseViewHolder> {
public WorkOrderFaultAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, FaultBean.ListBean item) {
helper.setText(R.id.tv_name, item.getFailureName());
helper.setText(R.id.tv_type, item.getFailureCode());
}
}
app/src/main/res/layout/fg_work_order_detail_fault.xml 0 → 100644
浏览文件 @ e4353837
<?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: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">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/flexible_background"
android:paddingVertical="10mm"
android:paddingLeft="10mm"
android:visibility="gone"
android:text="基本信息"
android:textSize="16sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
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_no"
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:visibility="gone"
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_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/flexible_background"
android:paddingVertical="10mm"
android:paddingLeft="10mm"
android:text="故障详细信息"
android:textSize="16sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
app/src/main/res/layout/fg_work_order_detail_plan.xml
浏览文件 @ e4353837
......@@ -6,7 +6,6 @@
<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
......
app/src/main/res/layout/item_work_order_fault.xml 0 → 100644
浏览文件 @ e4353837
<?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="20mm"
android:paddingTop="10mm"
android:paddingBottom="10mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
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_type"
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: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_name"
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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论