Skip to content

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

1.设备维修详情+审核 

2.//TODO (采购新增，设备采购-维修列表接口,新增维修的部门接口，接单显示规则)，坩埚下单，下单时间选择器当前时间验证，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 f2fb75d7
隐藏空白字符变更
内嵌 并排
正在显示 包含 91 行增加 和 39 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 1218c867
......@@ -1823,4 +1823,19 @@ public interface ApiService {
*/
@PUT("/equipmentRepair/audit")
Observable<BaseBean> equipmentRepairAudit(@Body RequestBody requestBody);
/**
* 接单
*
* @return
*/
@PUT("/equipmentPurchase/apply")
Observable<BaseBean> equipmentPurchaseApply(@Body RequestBody requestBody);
/**
* 单
*
* @return
*/
@PUT("/equipmentRepair/apply")
Observable<BaseBean> equipmentRepairApply(@Body RequestBody requestBody);
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceBuyDetailActivity.java
浏览文件 @ 1218c867
......@@ -88,13 +88,6 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
}
private void changePermission() {
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_PURCHASE_REPAIR_UPDATE.getPermission())) {
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
}
}
@Override
protected void initData() {
info = JSON.parseObject(getIntent().getStringExtra("info"), DeviceBuyBean.RecordsBean.class);
......@@ -108,8 +101,19 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
tvPrice.setText(info.getCreatedTime());
tvRemark.setText(info.getRemark());
if (info.getStatus() == 100) {
llBottom.setVisibility(View.VISIBLE);
changePermission();
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_PURCHASE_REPAIR_UPDATE.getPermission())) {
llBottom.setVisibility(View.GONE);
} else {
llBottom.setVisibility(View.VISIBLE);
}
} else if (info.getStatus() == 200) {
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_PURCHASE_REPAIR_APPLY.getPermission())) {
llBottom.setVisibility(View.GONE);
} else {
llBottom.setVisibility(View.VISIBLE);
tvRefuse.setText("拒单");
tvAgree.setText("接单");
}
} else {
llBottom.setVisibility(View.GONE);
}
......@@ -162,10 +166,18 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
checkDialog(220);
if (info.getStatus() == 100) {
checkDialog(220);
} else {
checkDialog(320);
}
break;
case R.id.tv_agree:
checkDialog(200);
if (info.getStatus() == 100) {
checkDialog(200);
} else {
checkDialog(300);
}
break;
}
}
......@@ -175,7 +187,7 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvDesc = view.findViewById(R.id.tv_desc);
tvDesc.setText(status == 1 ? "通过" : "拒绝");
tvDesc.setText(status % 100==0 ? "通过" : "拒绝");
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
......@@ -220,9 +232,16 @@ public class DeviceBuyDetailActivity extends WorkToolBarActivity {
private void check(int status, String remark) {
param.put("status", status);
param.put("auditRemark", remark);
param.put("id", info.getId());
RtfUtils.getRtf().equipmentPurchaseAudit(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Observable<BaseBean> observable ;
if (info.getStatus() == 100) {
param.put("auditRemark", remark);
observable = RtfUtils.getRtf().equipmentPurchaseAudit(WorkUtils.convertMapToBody(param));
} else {
param.put("ensureComment", remark);
observable = RtfUtils.getRtf().equipmentPurchaseApply(WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/DeviceRepairDetailActivity.java
浏览文件 @ 1218c867
......@@ -37,6 +37,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
......@@ -84,15 +85,6 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
tvDesc.setText("维修明细");
}
private void changePermission() {
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_REPAIR_UPDATE.getPermission())) {
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
} else {
llBottom.setVisibility(View.VISIBLE);
}
}
@Override
protected void initData() {
info = JSON.parseObject(getIntent().getStringExtra("info"), DeviceBuyBean.RecordsBean.class);
......@@ -106,12 +98,18 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
tvPrice.setText(info.getCreatedTime());
tvRemark.setText(info.getRemark());
if (info.getStatus() == 100) {
changePermission();
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_REPAIR_UPDATE.getPermission())) {
llBottom.setVisibility(View.GONE);
} else {
llBottom.setVisibility(View.VISIBLE);
}
} else if (info.getStatus() == 200) {
if (!WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_REPAIR_APPLY.getPermission())) {
llBottom.setVisibility(View.GONE);
} else {
llBottom.setVisibility(View.VISIBLE);
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
tvRefuse.setText("拒单");
tvAgree.setText("接单");
}
} else {
llBottom.setVisibility(View.GONE);
......@@ -164,10 +162,18 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
checkDialog(220);
if (info.getStatus() == 100) {
checkDialog(220);
} else {
checkDialog(320);
}
break;
case R.id.tv_agree:
checkDialog(200);
if (info.getStatus() == 100) {
checkDialog(200);
} else {
checkDialog(300);
}
break;
}
}
......@@ -177,7 +183,7 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvDesc = view.findViewById(R.id.tv_desc);
tvDesc.setText(status == 1 ? "通过" : "拒绝");
tvDesc.setText(status % 100 == 0 ? "通过" : "拒绝");
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
......@@ -222,9 +228,16 @@ public class DeviceRepairDetailActivity extends WorkToolBarActivity {
private void check(int status, String remark) {
param.put("status", status);
param.put("auditRemark", remark);
param.put("id", info.getId());
RtfUtils.getRtf().equipmentRepairAudit(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Observable<BaseBean> observable;
if (info.getStatus() == 100) {
param.put("auditRemark", remark);
observable = RtfUtils.getRtf().equipmentRepairAudit(WorkUtils.convertMapToBody(param));
} else {
param.put("ensureComment", remark);
observable = RtfUtils.getRtf().equipmentRepairApply(WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceBuyActivity.java
浏览文件 @ 1218c867
......@@ -3,6 +3,7 @@ package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
......@@ -82,7 +83,9 @@ public class WorkDeviceBuyActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_add, menu);
if (WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_PURCHASE_REPAIR_ADD.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
return super.onCreateOptionsMenu(menu);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkDeviceRepairActivity.java
浏览文件 @ 1218c867
......@@ -82,15 +82,17 @@ public class WorkDeviceRepairActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
if (WorkUtils.hasPermission(PagePermissionType.EQUIPMENT_REPAIR_ADD.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivity(CrucibleOrderSearchActivity.class, "identity", getIntent().getStringExtra("identity"));
case R.id.add:
startActivity(WorkDeviceBuyAddActivity.class);
break;
}
return super.onOptionsItemSelected(item);
......
app/src/main/java/com/wd/workoffice/ui/fg/DeviceRepairCheckListFragment.java
浏览文件 @ 1218c867
......@@ -13,6 +13,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.DeviceBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.RepairBean;
import com.wd.workoffice.bean.event.CheckDeviceEvent;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -55,7 +56,6 @@ public class DeviceRepairCheckListFragment extends WorkBaseFg {
private Map<String, Object> param;
private DeviceRepairAdapter dataAdapter;
private List<RepairBean.RecordsBean> dataList;
private String identity;
@Override
protected void initView() {
......@@ -85,7 +85,6 @@ public class DeviceRepairCheckListFragment extends WorkBaseFg {
Bundle arguments = getArguments();
if (arguments != null) {
state = arguments.getString("state");
identity = arguments.getString("identity");
}
}
......@@ -168,7 +167,7 @@ public class DeviceRepairCheckListFragment extends WorkBaseFg {
}
@Subscribe
public void refresh(CheckOrderEvent event) {
public void refresh(CheckDeviceEvent event) {
page = 1;
param.put("current", page);
getData();
......
app/src/main/java/com/wd/workoffice/ui/fg/DeviceRepairListFragment.java
浏览文件 @ 1218c867
......@@ -13,6 +13,7 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.DeviceBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.RepairBean;
import com.wd.workoffice.bean.event.CheckDeviceEvent;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -169,7 +170,7 @@ public class DeviceRepairListFragment extends WorkBaseFg {
}
@Subscribe
public void refresh(CheckOrderEvent event) {
public void refresh(CheckDeviceEvent event) {
page = 1;
param.put("current", page);
getData();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论