Skip to content

W
workoffice
提交 95929768 authored 作者: flexiblexd@163.com's avatar flexiblexd@163.com
浏览文件
操作

1.工单相关

上级 d152a485
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 179 行增加 和 16 行删除
app/src/main/java/com/wd/workoffice/bean/event/AddFaultEvent.java 0 → 100644
浏览文件 @ 95929768
package com.wd.workoffice.bean.event;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class AddFaultEvent {
boolean addReason = false;
boolean addSolve = false;
public AddFaultEvent(boolean addReason, boolean addSolve) {
this.addReason = addReason;
this.addSolve = addSolve;
}
public boolean isAddReason() {
return addReason;
}
public void setAddReason(boolean addReason) {
this.addReason = addReason;
}
public boolean isAddSolve() {
return addSolve;
}
public void setAddSolve(boolean addSolve) {
this.addSolve = addSolve;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceCheckDetailActivity.java
浏览文件 @ 95929768
......@@ -236,7 +236,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
PickTimeUtils.showPickTime(this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
tvTrueStarTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("hh:mm:ss")));
tvTrueStarTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("HH:mm:ss")));
info.setBeginTimeActual(tvTrueStarTime.getText().toString());
// paramMap.put("createDateTime", TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
// page = 1;
......@@ -249,7 +249,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
PickTimeUtils.showPickTime(this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
tvTrueEndTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("hh:mm:ss")));
tvTrueEndTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("HH:mm:ss")));
info.setEndTimeActual(tvTrueEndTime.getText().toString());
// paramMap.put("createDateTime", TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
// page = 1;
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkFaultFragment.java
浏览文件 @ 95929768
......@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.mes.work;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
......@@ -10,6 +11,7 @@ import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.event.AddFaultEvent;
import com.wd.workoffice.bean.event.CheckEvent;
import com.wd.workoffice.bean.mesBean.FaultBean;
import com.wd.workoffice.bean.mesBean.SolveBean;
......@@ -83,6 +85,7 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
private Map<String, Object> taskParamMap;
private FaultBean.ListBean chooseReason;
private FaultBean.ListBean chooseSolve;
private boolean canModify = true;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
......@@ -97,9 +100,16 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
protected void initView() {
ButterKnife.bind(this, getContentView());
rvData.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
changeView();
}
private void changeView() {
if (info.getStatus() != 3) {
canModify = false;
}
}
@Override
protected void initData() {
// tvNo.setText(info.getWoCode());
......@@ -227,6 +237,7 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
}
List<FaultBean.ListBean> getList = JSON.parseObject(data.getData().toString(), FaultBean.class).getList();
if (getList.size() != 0) {
EventBus.getDefault().post(new AddFaultEvent(true, false));
FaultBean.ListBean fault = getList.get(0);
if (chooseReason == null) {
chooseReason = new FaultBean.ListBean();
......@@ -274,7 +285,7 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
List<SolveBean.ListBean> getList = JSON.parseObject(data.getData().toString(), SolveBean.class).getList();
if (getList.size() != 0) {
SolveBean.ListBean fault = getList.get(0);
EventBus.getDefault().post(new AddFaultEvent(true, true));
if (chooseSolve == null) {
chooseSolve = new FaultBean.ListBean();
chooseSolve.setId(fault.getFailureId());
......@@ -396,6 +407,7 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
}
toast("操作成功");
getSolveFault(chooseReason.getId());
//
// tvCode.setText(chooseReason.getFailureCode());
// tvDesc.setText(chooseReason.getDescription());
}
......@@ -428,6 +440,7 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
tvCode.setText("");
tvDesc.setText("");
chooseReason = null;
EventBus.getDefault().post(new AddFaultEvent(false, false));
}
});
}
......@@ -457,6 +470,8 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
tvSolveCode.setText("");
tvSolveDesc.setText("");
chooseSolve = null;
EventBus.getDefault().post(new AddFaultEvent(false, true));
}
});
}
......@@ -470,6 +485,9 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
public void onClick(View view) {
switch (view.getId()) {
case R.id.tv_delete:
if (!canModify) {
return;
}
if (chooseSolve != null) {
toast("请先删除解决措施");
return;
......@@ -477,6 +495,9 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
deleteReason();
break;
case R.id.ll_code:
if (!canModify) {
return;
}
if (chooseReason != null) {
toast("请先删除后,在重新选择");
return;
......@@ -485,6 +506,9 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
, "id", info.getQuestionId());
break;
case R.id.tv_solve_delete:
if (!canModify) {
return;
}
if (chooseReason == null) {
toast("您还未选择");
return;
......@@ -496,6 +520,9 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
deleteSolve();
break;
case R.id.ll_solve_code:
if (!canModify) {
return;
}
if (chooseReason == null) {
toast("请选择故障原因");
return;
......@@ -511,6 +538,10 @@ public class QualityWorkFaultFragment extends WorkBaseFg {
check(6);
break;
case R.id.tv_finish:
if (info.getWorkType() == 4 && (chooseReason == null || chooseSolve == null)) {
toast("请填写故障原因、解决措施");
return;
}
check(5);
break;
case R.id.tv_ok:
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkPlanFragment.java
浏览文件 @ 95929768
......@@ -145,6 +145,14 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
llBottom.setVisibility(View.GONE);
break;
}
changeView();
}
private void changeView() {
if (!WorkUtils.workCanModify(info.getStatus())){
tvAddTask.setVisibility(View.GONE);
}
}
......@@ -154,7 +162,7 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
tvDesc.setText(info.getDescription());
tvStatus.setText(WorkOrder.getNameByCode(info.getStatus()));
taskList = new ArrayList<>();
taskAdapter = new WorkOrderTaskAdapter(R.layout.item_work_order_task, taskList);
taskAdapter = new WorkOrderTaskAdapter(R.layout.item_work_order_task, taskList,WorkUtils.workCanModify(info.getStatus()));
taskAdapter.bindToRecyclerView(rvData);
sonList = new ArrayList<>();
......@@ -300,7 +308,8 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkTaskDetailActivity.class,
"plan", "1", "info", JSON.toJSONString(taskList.get(position)));
"plan", "1", "info", JSON.toJSONString(taskList.get(position))
,"work", JSON.toJSONString(info));
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkTrueFragment.java
浏览文件 @ 95929768
......@@ -137,8 +137,15 @@ public class QualityWorkTrueFragment extends WorkBaseFg {
llBottom.setVisibility(View.GONE);
break;
}
changeView();
}
private void changeView() {
if (info.getStatus() != 3) {
tvAddTask.setVisibility(View.GONE);
}
}
@Override
protected void initData() {
......@@ -146,7 +153,7 @@ public class QualityWorkTrueFragment extends WorkBaseFg {
tvDesc.setText(info.getDescription());
tvStatus.setText(WorkOrder.getNameByCode(info.getStatus()));
taskList = new ArrayList<>();
taskAdapter = new WorkOrderTaskAdapter(R.layout.item_work_order_task, taskList);
taskAdapter = new WorkOrderTaskAdapter(R.layout.item_work_order_task, taskList, info.getStatus() == 3);
taskAdapter.bindToRecyclerView(rvData);
sonList = new ArrayList<>();
......@@ -266,7 +273,8 @@ public class QualityWorkTrueFragment extends WorkBaseFg {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkTaskDetailActivity.class,
"plan", "0", "info", JSON.toJSONString(taskList.get(position)));
"plan", "0", "info", JSON.toJSONString(taskList.get(position))
,"work", JSON.toJSONString(info));
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkTaskDetailActivity.java
浏览文件 @ 95929768
......@@ -45,6 +45,7 @@ public class WorkTaskDetailActivity extends WorkToolBarActivity {
String plan = getIntent().getStringExtra("plan");
Bundle bundle = new Bundle();
bundle.putString("info", getIntent().getStringExtra("info"));
bundle.putString("work", getIntent().getStringExtra("work"));
bundle.putString("plan", plan);
FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>();
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkTaskMaterialsFragment.java
浏览文件 @ 95929768
......@@ -17,6 +17,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.event.AddTaskEvent;
import com.wd.workoffice.bean.mesBean.TaskMaterials;
import com.wd.workoffice.bean.mesBean.TaskPeopleBean;
import com.wd.workoffice.bean.mesBean.WokrOrderBean;
import com.wd.workoffice.bean.mesBean.WorkTaskBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -60,6 +61,8 @@ public class WorkTaskMaterialsFragment extends WorkBaseFg {
private Map<String, Object> taskParam;
private Map<String, Object> taskParamMap;
private String plan;
private boolean canModify =true;
private WokrOrderBean.ListBean work;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
......@@ -67,6 +70,7 @@ public class WorkTaskMaterialsFragment extends WorkBaseFg {
Bundle arguments = getArguments();
if (arguments != null) {
info = JSON.parseObject(arguments.getString("info"), WorkTaskBean.ListBean.class);
work = JSON.parseObject(arguments.getString("work"), WokrOrderBean.ListBean.class);
plan = arguments.getString("plan");
}
}
......@@ -75,13 +79,29 @@ public class WorkTaskMaterialsFragment extends WorkBaseFg {
protected void initView() {
ButterKnife.bind(this, getContentView());
rvData.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
changeView();
}
private void changeView() {
if (TextUtils.equals(plan, "1")) {
if (!WorkUtils.workCanModify(work.getStatus())) {
tvAdd.setVisibility(View.GONE);
canModify = false;
}
} else {
if (info.getStatus() != 3) {
tvAdd.setVisibility(View.GONE);
canModify = false;
}
}
}
@Override
protected void initData() {
taskList = new ArrayList<>();
taskAdapter = new WorkTaskMaterialsAdapter(R.layout.item_work_task_materials, taskList);
taskAdapter = new WorkTaskMaterialsAdapter
(R.layout.item_work_task_materials, taskList,canModify);
taskAdapter.setEmptyView(R.layout.view_empty_content, rvData);
taskAdapter.bindToRecyclerView(rvData);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/work/WorkTaskPeopleFragment.java
浏览文件 @ 95929768
......@@ -16,6 +16,7 @@ import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.event.AddTaskEvent;
import com.wd.workoffice.bean.mesBean.TaskPeopleBean;
import com.wd.workoffice.bean.mesBean.WokrOrderBean;
import com.wd.workoffice.bean.mesBean.WorkTaskBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -65,6 +66,8 @@ public class WorkTaskPeopleFragment extends WorkBaseFg {
private Map<String, Object> taskParam;
private Map<String, Object> taskParamMap;
private String plan;
private boolean canModify =true;
private WokrOrderBean.ListBean work;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
......@@ -72,6 +75,7 @@ public class WorkTaskPeopleFragment extends WorkBaseFg {
Bundle arguments = getArguments();
if (arguments != null) {
info = JSON.parseObject(arguments.getString("info"), WorkTaskBean.ListBean.class);
work = JSON.parseObject(arguments.getString("work"), WokrOrderBean.ListBean.class);
plan = arguments.getString("plan");
}
}
......@@ -79,15 +83,33 @@ public class WorkTaskPeopleFragment extends WorkBaseFg {
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
tvAgree.setVisibility(View.VISIBLE);
tvAgree.setVisibility(View.GONE);
rvData.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
changeView();
}
private void changeView() {
if (TextUtils.equals(plan, "1")) {
if (!WorkUtils.workCanModify(work.getStatus())) {
tvAdd.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
canModify = false;
}
} else {
if (info.getStatus() != 3) {
tvAdd.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
canModify = false;
}
}
}
@Override
protected void initData() {
taskList = new ArrayList<>();
taskAdapter = new WorkTaskPeopleAdapter(R.layout.item_work_task_people, taskList);
taskAdapter = new WorkTaskPeopleAdapter
(R.layout.item_work_task_people, taskList,canModify);
taskAdapter.setEmptyView(R.layout.view_empty_content, rvData);
taskAdapter.bindToRecyclerView(rvData);
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkOrderTaskAdapter.java
浏览文件 @ 95929768
package com.wd.workoffice.ui.adapter;
import android.view.View;
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.WorkTaskBean;
import com.wd.workoffice.bean.mesBean.WorkTaskMaterialsBean;
import com.wd.workoffice.bean.workEnum.WorkOrder;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
......@@ -15,20 +18,29 @@ import java.util.List;
*/
public class WorkOrderTaskAdapter extends BaseQuickAdapter<WorkTaskBean.ListBean, BaseViewHolder> {
boolean canModify;
// public WorkOrderTaskAdapter(int layoutResId, List data) {
// super(layoutResId, data);
// }
// public WorkOrderTaskAdapter(int layoutResId, List data, int status) {
// super(layoutResId, data);
// this.status = status;
// }
public WorkOrderTaskAdapter(int layoutResId, List data) {
public WorkOrderTaskAdapter(int layoutResId, List data, boolean canModify) {
super(layoutResId, data);
this.canModify = canModify;
}
@Override
protected void convert(BaseViewHolder helper, WorkTaskBean.ListBean item) {
helper.setText(R.id.tv_no, String.format("任务号:%s", item.getActNum()));
helper.setText(R.id.tv_status, WorkOrder.getNameByCode(item.getStatus()));
helper.setText(R.id.tv_desc, item.getDescription());
helper.setText(R.id.tv_time, item.getTime()+"");
helper.setText(R.id.tv_time, item.getTime() + "");
helper.addOnClickListener(R.id.tv_delete);
helper.addOnClickListener(R.id.tv_edit);
helper.setGone(R.id.ll_btn, canModify);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkTaskMaterialsAdapter.java
浏览文件 @ 95929768
......@@ -15,9 +15,11 @@ import java.util.List;
*/
public class WorkTaskMaterialsAdapter extends BaseQuickAdapter<TaskMaterials.ListBean, BaseViewHolder> {
boolean canModify;
public WorkTaskMaterialsAdapter(int layoutResId, List data) {
public WorkTaskMaterialsAdapter(int layoutResId, List data ,boolean canModify) {
super(layoutResId, data);
this.canModify = canModify;
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkTaskPeopleAdapter.java
浏览文件 @ 95929768
......@@ -16,8 +16,11 @@ import java.util.List;
public class WorkTaskPeopleAdapter extends BaseQuickAdapter<TaskPeopleBean.ListBean, BaseViewHolder> {
public WorkTaskPeopleAdapter(int layoutResId, List data) {
boolean canModify;
public WorkTaskPeopleAdapter(int layoutResId, List data, boolean canModify) {
super(layoutResId, data);
this.canModify = canModify;
}
......@@ -30,6 +33,7 @@ public class WorkTaskPeopleAdapter extends BaseQuickAdapter<TaskPeopleBean.ListB
helper.setText(R.id.tv_skill, item.getSkillName());
helper.addOnClickListener(R.id.tv_edit);
helper.addOnClickListener(R.id.tv_delete);
helper.setGone(R.id.ll_btn, canModify);
}
}
app/src/main/java/com/wd/workoffice/util/WorkUtils.java
浏览文件 @ 95929768
......@@ -1005,4 +1005,21 @@ public class WorkUtils {
// }
return img;
}
public static boolean workCanModify(int type) {
boolean canModify = false;
switch (type) {// "状态 1草稿 2待审批 3处理中 4已完成待确认 5已关闭 6已驳回
case 1:
canModify = true;
break;
case 2:
canModify = false;
break;
case 3:
break;
case 4:
break;
}
return canModify;
}
}
app/src/main/res/layout/fg_work_order_detail.xml
浏览文件 @ 95929768
......@@ -812,6 +812,7 @@
<RelativeLayout
android:id="@+id/rl_true_star_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -838,6 +839,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_true_end_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......
app/src/main/res/layout/item_work_task_materials.xml
浏览文件 @ 95929768
......@@ -130,6 +130,7 @@
android:textSize="13sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_btn"
android:layout_width="match_parent"
android:gravity="right"
android:layout_height="wrap_content">
......
app/src/main/res/layout/item_work_task_people.xml
浏览文件 @ 95929768
......@@ -133,6 +133,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ll_btn"
android:layout_width="match_parent"
android:gravity="right"
android:layout_height="wrap_content">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论