Skip to content

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

1.點檢检修

上级 2893e7d8
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 802 行增加 和 51 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ b149fbb0
......@@ -2586,7 +2586,76 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.repair.ServiceFaultActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="生成故障单"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.repair.MesFaultSearchActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="搜索"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.repair.MesFaultCodeSearchActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="搜索"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.work.WorkOrderFacotySearchActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="搜索"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.work.WorkOrderFacotySearchActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="搜索"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.work.WorkOrderLocationSearchActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="搜索"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.work.WorkOrderMachineSearchActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="搜索"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.work.WorkOrderNoSearchActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
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/ui/activity/mes/repair/MesFaultCodeSearchActivity.java 0 → 100644
浏览文件 @ b149fbb0
package com.wd.workoffice.ui.activity.mes.repair;
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.FaultTypeBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.FauliTypeAdapter;
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 MesFaultCodeSearchActivity 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<FaultTypeBean.ListBean> clientList;
private FauliTypeAdapter 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));
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new FauliTypeAdapter(R.layout.item_fault_search, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
paramMap.put("parentId", getIntent().getStringExtra("id"));
param.put("paramMap", paramMap);
param.put("pageNum", 1);
getData();
}
private void getData() {
RtfUtils.getMesRtf().astfailureLinelist("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<FaultTypeBean.ListBean> getList = JSON.parseObject(data.getData().toString(), FaultTypeBean.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_fault_search;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("failureCode", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/MesFaultSearchActivity.java 0 → 100644
浏览文件 @ b149fbb0
package com.wd.workoffice.ui.activity.mes.repair;
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.FaultTypeBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.FauliTypeAdapter;
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 MesFaultSearchActivity 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<FaultTypeBean.ListBean> clientList;
private FauliTypeAdapter 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));
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new FauliTypeAdapter(R.layout.item_fault_search, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
param.put("paramMap",paramMap);
param.put("pageNum", 1);
getData();
}
private void getData() {
RtfUtils.getMesRtf().astfailurelist("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<FaultTypeBean.ListBean> getList = JSON.parseObject(data.getData().toString(), FaultTypeBean.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_fault_search;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("failureCode", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceCheckDetailActivity.java
浏览文件 @ b149fbb0
......@@ -2,9 +2,11 @@ package com.wd.workoffice.ui.activity.mes.repair;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
......@@ -15,9 +17,12 @@ import com.wd.workoffice.bean.mesBean.ServiceCheckBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesServiceCheckDetailAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -25,11 +30,12 @@ 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 flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
/**
*
* 点检详情
* author : flexible
* email : lgd19940421@163.com
......@@ -73,6 +79,10 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
TextView tvTrueEndTime;
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.rl_true_star_time)
RelativeLayout rlTrueStarTime;
@BindView(R.id.rl_true_end_time)
RelativeLayout rlTrueEndTime;
private Map<String, Object> param;
private List<MesServiceCheckBillBean.ListBean> dataList;
private MesServiceCheckDetailAdapter dataAdapter;
......@@ -98,6 +108,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
param = WorkUtils.pageMesKey();
Map<String, Object> paramMap = WorkUtils.simpleParam();
param.put("paramMap", paramMap);
param.put("length", 15);
paramMap.put("billId", info.getId());
param.put("pageNum", page);
getDetail();
......@@ -114,12 +125,12 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
tvFactory.setText(info.getSiteName());
tvRemark.setText(info.getBillDescription());
tvPlanStarTime.setText(info.getPlanBeginTime());
tvPlanEndTime.setText(info.getPlanEndTime());
tvChangeStarTime.setText(info.getAdjustBeginTime());
tvChangeEndTime.setText(info.getAdjustEndTime());
tvTrueStarTime.setText(info.getActualBeginTime());
tvTrueEndTime.setText(info.getActualEndTime());
tvPlanStarTime.setText(info.getBeginTimePlan());
tvPlanEndTime.setText(info.getEndTimePlan());
tvChangeStarTime.setText(info.getBeginTimeAdjust());
tvChangeEndTime.setText(info.getEndTimeAdjust());
tvTrueStarTime.setText(info.getBeginTimeActual());
tvTrueEndTime.setText(info.getEndTimeActual());
}
private void getDetail() {
......@@ -149,7 +160,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
private void getData() {
RtfUtils.getMesRtf().spotCheckBill("00d12c310f4411ea8334fa163e1166bd", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
RtfUtils.getMesRtf().spotCheckBillProject("00d12c310f4411ea8334fa163e1166bd", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......@@ -196,7 +207,9 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
startActivity(ServiceStandardActivity.class,"id",dataList.get(i).getId());
startActivity(ServiceStandardActivity.class, "id", dataList.get(i).getId(),
"info",getIntent().getStringExtra("info"),
"machine",JSON.toJSONString(dataList.get(i)),"type",getIntent().getStringExtra("type"));
}
});
}
......@@ -207,4 +220,95 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
return R.layout.activity_mes_service_check_detail;
}
@OnClick({R.id.tv_refuse, R.id.tv_agree,R.id.rl_true_star_time, R.id.rl_true_end_time})
public void onClick(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
save();
break;
case R.id.tv_agree:
finishRequest();
break;
case R.id.rl_true_star_time:
PickTimeUtils.showPickTime(this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
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;
// param.put("pageNum", page);
// getData();
}
}, false).show();
break;
case R.id.rl_true_end_time:
PickTimeUtils.showPickTime(this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
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;
// param.put("pageNum", page);
// getData();
}
}, false).show();
break;
}
}
private void save() {
RtfUtils.getMesRtf().spotCheckBillUpdate("00d12c310f4411ea8334fa163e1166bd",
WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info)))).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;
}
toast("保存成功");
finish();
}
});
}
private void finishRequest() {
info.setStatus(3);
RtfUtils.getMesRtf().spotCheckBillUpdate("00d12c310f4411ea8334fa163e1166bd",
WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info)))).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());
info.setStatus(null);
return;
}
toast("保存成功");
finish();
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceDetailActivity.java
浏览文件 @ b149fbb0
package com.wd.workoffice.ui.activity.mes.repair;
import android.os.Bundle;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
......@@ -15,9 +18,12 @@ import com.wd.workoffice.bean.mesBean.ServiceBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesServiceDetailAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -25,7 +31,9 @@ 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 flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
/**
......@@ -71,6 +79,12 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
TextView tvTrueEndTime;
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.rl_true_star_time)
RelativeLayout rlTrueStarTime;
@BindView(R.id.rl_true_end_time)
RelativeLayout rlTrueEndTime;
@BindView(R.id.tv_close)
TextView tvClose;
private Map<String, Object> param;
private List<MesServiceBillBean.ListBean> dataList;
private MesServiceDetailAdapter dataAdapter;
......@@ -101,8 +115,13 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
}
private void changeView() {
// 2待执行 3 已完成
tvNo.setText(info.getInspoCode());
tvStatus.setText(info.getStatus() == 1 ? "未维修" : "已检修");
tvClose.setText(info.getStopWork() == 1 ? "是" : "否");
tvStatus.setText(info.getStatus() == 3 ? "已完成" : "待执行");
if (info.getStatus() == 3) {
llBottom.setVisibility(View.GONE);
}
tvPerson.setText(info.getPrincipalName());
tvPlan.setText(info.getPlanDesc());
tvLocation.setText(info.getLocationName());
......@@ -110,12 +129,13 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
tvFactory.setText(info.getSiteDesc());
tvRemark.setText(info.getDescription());
// tvPlanStarTime.setText(info.getPlanBeginTime());
// tvPlanEndTime.setText(info.getPlanEndTime());
tvChangeStarTime.setText(info.getAdjustBeginTime());
tvChangeEndTime.setText(info.getAdjustEndTime());
// tvTrueStarTime.setText(info.getActualBeginTime());
// tvTrueEndTime.setText(info.getActualEndTime());
tvPlanStarTime.setText(info.getPlanStartDateTime());
tvPlanEndTime.setText(info.getPlanEndDateTime());
// tvChangeStarTime.setText(info.getAdjustBeginTime());
// tvChangeEndTime.setText(info.getAdjustEndTime());
tvTrueStarTime.setText(info.getActualStartDateTime());
tvTrueEndTime.setText(info.getActualEndDateTime());
}
......@@ -156,6 +176,28 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
}
}
});
RtfUtils.getMesRtf().modinspoDetail( info.getId(),"1").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;
}
ServiceBean.ListBean dataBean = JSON.parseObject(data.getData().toString(), ServiceBean.ListBean.class);
info.setAssetId(dataBean.getAssetId());
}
});
}
@Override
......@@ -167,7 +209,9 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
startActivity(ServiceStandardActivity.class, "id", dataList.get(i).getId(),"type","1");
startActivity(ServiceStandardActivity.class, "id", dataList.get(i).getId(),
"info", JSON.toJSONString(info),
"machine", JSON.toJSONString(dataList.get(i)), "type", "1");
}
});
}
......@@ -178,4 +222,108 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
return R.layout.activity_mes_service_detail;
}
@OnClick({R.id.tv_refuse, R.id.tv_agree, R.id.rl_true_star_time, R.id.rl_true_end_time})
public void onClick(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
save();
break;
case R.id.tv_agree:
finishRequest();
break;
case R.id.rl_true_star_time:
PickTimeUtils.showPickTime(this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
tvTrueStarTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("hh:mm:ss")));
info.setActualStartDateTime(tvTrueStarTime.getText().toString());
// paramMap.put("createDateTime", TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
// page = 1;
// param.put("pageNum", page);
// getData();
}
}, false).show();
break;
case R.id.rl_true_end_time:
PickTimeUtils.showPickTime(this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
tvTrueEndTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("hh:mm:ss")));
info.setActualEndDateTime(tvTrueEndTime.getText().toString());
// paramMap.put("createDateTime", TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
// page = 1;
// param.put("pageNum", page);
// getData();
}
}, false).show();
break;
}
}
private void save() {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("id", info.getId());
param.put("inspoCode", info.getInspoCode());
param.put("status", 2);
param.put("actualEndDateTime", info.getActualEndDateTime());
param.put("actualStartDateTime", info.getActualStartDateTime());
RtfUtils.getMesRtf().modinspoprojectUpdate("00d12c310f4411ea8334fa163e1166bd",
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;
}
toast("保存成功");
finish();
}
});
}
private void finishRequest() {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("status", "3");
param.put("id", info.getId());
param.put("inspoCode", info.getInspoCode());
param.put("actualEndDateTime", info.getActualEndDateTime());
param.put("actualStartDateTime", info.getActualStartDateTime());
RtfUtils.getMesRtf().modinspoprojectUpdate("00d12c310f4411ea8334fa163e1166bd",
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;
}
toast("保存成功");
finish();
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceStandardActivity.java
浏览文件 @ b149fbb0
......@@ -12,12 +12,16 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.ChangeStatus;
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 org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -186,7 +190,11 @@ public class ServiceStandardActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
startActivity(ServiceStandardDetailActivity.class, "info", JSON.toJSONString(dataList.get(i)),
"type", getIntent().getStringExtra("type"));
"type", getIntent().getStringExtra("type"),
"data", getIntent().getStringExtra("info"),
"machine", getIntent().getStringExtra("machine")
,"type",getIntent().getStringExtra("type")
);
}
});
}
......@@ -196,4 +204,26 @@ public class ServiceStandardActivity extends WorkToolBarActivity {
return R.layout.activity_pro_price;
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(ChangeStatus event) {
page = 1;
param.put("pageNum", 1);
if (!TextUtils.isEmpty(getIntent().getStringExtra("type"))) {//维修
getServiceData();
} else {
getData();
}
}
}
app/src/main/java/com/wd/workoffice/ui/fg/MesCheckFragment.java
浏览文件 @ b149fbb0
......@@ -97,7 +97,7 @@ public class MesCheckFragment extends WorkBaseFg {
}
private void getData() {
RtfUtils.getMesRtf().spotCheckBillList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
RtfUtils.getMesRtf().spotCheckBillListForApp("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......@@ -121,6 +121,7 @@ public class MesCheckFragment extends WorkBaseFg {
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
srlRefresh.finishRefresh();
} else {
dataAdapter.loadMoreComplete();
dataList.addAll(getList);
......
app/src/main/java/com/wd/workoffice/ui/fg/MesServiceFragment.java
浏览文件 @ b149fbb0
......@@ -98,7 +98,7 @@ public class MesServiceFragment extends WorkBaseFg {
}
private void getData() {
RtfUtils.getMesRtf().modinspoList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
RtfUtils.getMesRtf().modinspoListForApp("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......@@ -122,6 +122,7 @@ public class MesServiceFragment extends WorkBaseFg {
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
srlRefresh.finishRefresh();
} else {
dataAdapter.loadMoreComplete();
dataList.addAll(getList);
......@@ -150,7 +151,7 @@ public class MesServiceFragment extends WorkBaseFg {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(ServiceDetailActivity.class,"info",JSON.toJSONString(dataList.get(position)));
startActivity(ServiceDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
}
});
}
......@@ -165,12 +166,12 @@ public class MesServiceFragment extends WorkBaseFg {
PickTimeUtils.showPickThree(getActivity(), new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View view) {
tvTime.setText(TimeUtils.date2String(date,new SimpleDateFormat("yyyy-MM-dd")));
paramMap.put("createDateTime",TimeUtils.date2String(date,new SimpleDateFormat("yyyy-MM-dd")));
tvTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
paramMap.put("createDateTime", TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
page = 1;
param.put("pageNum", page);
getData();
}
},false).show();
}, false).show();
}
}
app/src/main/res/layout/activity_mes_service_check_detail.xml
浏览文件 @ b149fbb0
......@@ -9,19 +9,19 @@
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentBottom="true"
android:gravity="center_vertical|right"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
>
<TextView
android:id="@+id/tv_refuse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_red_btn"
android:background="@color/blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="驳回"
android:text="保存"
android:textColor="@color/white" />
<TextView
......@@ -29,10 +29,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_green_btn"
android:background="@color/blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="同意"
android:text="完成"
android:textColor="@color/white" />
</LinearLayout>
......@@ -383,6 +383,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_true_star_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -409,6 +410,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/activity_mes_service_detail.xml
浏览文件 @ b149fbb0
......@@ -9,19 +9,18 @@
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentBottom="true"
android:gravity="center_vertical|right"
android:orientation="horizontal"
android:visibility="gone">
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_refuse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_red_btn"
android:background="@color/blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="拒绝"
android:text="保存"
android:textColor="@color/white" />
<TextView
......@@ -29,10 +28,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_green_btn"
android:background="@color/blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="通过"
android:text="完成"
android:textColor="@color/white" />
</LinearLayout>
......@@ -241,7 +240,30 @@
</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_close"
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"
......@@ -330,6 +352,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -356,6 +379,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -382,6 +406,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_true_star_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -408,6 +433,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/activity_mes_service_standard_detail.xml
浏览文件 @ b149fbb0
......@@ -2,6 +2,28 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentBottom="true"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:id="@+id/tv_error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/blue_btn"
android:paddingHorizontal="40mm"
android:paddingVertical="5mm"
android:text="生成故障单"
android:textColor="@color/white" />
</LinearLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -41,6 +63,7 @@
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -145,7 +168,8 @@
<View style="@style/dividerX" />
<RelativeLayout
<LinearLayout
android:id="@+id/ll_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -162,12 +186,18 @@
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_weight="1"
android:gravity="right"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
<View style="@style/dividerX" />
......@@ -221,6 +251,7 @@
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
<View style="@style/dividerX" />
......@@ -239,13 +270,17 @@
android:text="备注"
android:textSize="14sp" />
<TextView
<EditText
android:id="@+id/tv_remark"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
android:layout_marginTop="5mm"
android:background="@drawable/shape_input_white"
android:gravity="top"
android:hint="请填写备注…"
android:minLines="4"
android:padding="5mm"
android:textSize="16sp" />
</LinearLayout>
......
app/src/main/res/layout/item_fault_search.xml 0 → 100644
浏览文件 @ b149fbb0
<?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:background="@color/white"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_content1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingVertical="15mm"
android:paddingLeft="5mm"
android:text="1243"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_content2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="1243"
android:textSize="16sp" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_mes_service_check.xml
浏览文件 @ b149fbb0
......@@ -73,7 +73,7 @@
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
......@@ -90,13 +90,15 @@
<TextView
android:id="@+id/tv_check_project"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:gravity="right"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:maxLines="1"
android:ellipsize="end"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<ImageView
......
app/src/main/res/menu/menu_save.xml 0 → 100644
浏览文件 @ b149fbb0
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/save"
android:title="保存"
app:showAsAction="always" />
</menu>
\ No newline at end of file
app/src/main/res/menu/menu_submit.xml 0 → 100644
浏览文件 @ b149fbb0
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/save"
android:title="提交"
app:showAsAction="always" />
</menu>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论