Skip to content

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

1.详情数据展示 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token
上级 96d92c4c
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 316 行增加 和 34 行删除
app/src/main/java/com/wd/workoffice/app/WorkApp.java
浏览文件 @ d7c8b8d5
......@@ -26,7 +26,7 @@ import okhttp3.Request;
public class WorkApp extends BaseApp {
private static Application instance;
// private static DaoSession daoSession;
@Override
public void onCreate() {
super.onCreate();
......@@ -41,8 +41,8 @@ public class WorkApp extends BaseApp {
RtfHelper.getInstance().init(ApiService.DOMAIN, chain -> {
Request original = chain.request();
Request request = original.newBuilder()
.header("Authorization", "Bearer "+UserKeeper.getInstance().getToken())
.header("userId",UserKeeper.getInstance().getUserId())
.header("Authorization", "Bearer " + UserKeeper.getInstance().getToken())
.header("userId", UserKeeper.getInstance().getUserId())
.method(original.method(), original.body())
.build();
......@@ -51,7 +51,7 @@ public class WorkApp extends BaseApp {
RtfMesHelper.getInstance().init(MesApiService.DOMAIN, chain -> {
Request original = chain.request();
Request request = original.newBuilder()
.header("Cookie", "SESSION=1f01ac55-973d-44c8-ac99-c9b990d454b1")
.header("Cookie", "SESSION=ca4aabe3-4ef2-479e-b315-6238899edaa8")
.method(original.method(), original.body())
.build();
......
app/src/main/java/com/wd/workoffice/bean/mesBean/JobTypeBean.java 0 → 100644
浏览文件 @ d7c8b8d5
package com.wd.workoffice.bean.mesBean;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class JobTypeBean {
/**
* id : 6
* jobTypeCode : 02
* jobTypeName : 新产品实验
* jobTypeContentCode : 02001
* jobTypeContentName : 试验产品
* orderId : 21
* createUserId : null
* createUserName : null
* createDateTime : 2020-03-25 11:10:30
* updateUserId : null
* updateUserName : null
* updateDateTime : 2020-03-25 11:10:30
* remark : null
* delete : null
*/
private int id;
private String jobTypeCode;
private String jobTypeName;
private String jobTypeContentCode;
private String jobTypeContentName;
private int orderId;
private Object createUserId;
private Object createUserName;
private String createDateTime;
private Object updateUserId;
private Object updateUserName;
private String updateDateTime;
private Object remark;
private Object delete;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getJobTypeCode() {
return jobTypeCode;
}
public void setJobTypeCode(String jobTypeCode) {
this.jobTypeCode = jobTypeCode;
}
public String getJobTypeName() {
return jobTypeName;
}
public void setJobTypeName(String jobTypeName) {
this.jobTypeName = jobTypeName;
}
public String getJobTypeContentCode() {
return jobTypeContentCode;
}
public void setJobTypeContentCode(String jobTypeContentCode) {
this.jobTypeContentCode = jobTypeContentCode;
}
public String getJobTypeContentName() {
return jobTypeContentName;
}
public void setJobTypeContentName(String jobTypeContentName) {
this.jobTypeContentName = jobTypeContentName;
}
public int getOrderId() {
return orderId;
}
public void setOrderId(int orderId) {
this.orderId = orderId;
}
public Object getCreateUserId() {
return createUserId;
}
public void setCreateUserId(Object createUserId) {
this.createUserId = createUserId;
}
public Object getCreateUserName() {
return createUserName;
}
public void setCreateUserName(Object createUserName) {
this.createUserName = createUserName;
}
public String getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(String createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(Object updateUserId) {
this.updateUserId = updateUserId;
}
public Object getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(Object updateUserName) {
this.updateUserName = updateUserName;
}
public String getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(String updateDateTime) {
this.updateDateTime = updateDateTime;
}
public Object getRemark() {
return remark;
}
public void setRemark(Object remark) {
this.remark = remark;
}
public Object getDelete() {
return delete;
}
public void setDelete(Object delete) {
this.delete = delete;
}
}
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ d7c8b8d5
......@@ -9,6 +9,7 @@ import io.reactivex.Observable;
import okhttp3.RequestBody;
import retrofit2.http.Body;
import retrofit2.http.POST;
import retrofit2.http.Query;
/**
* author : flexible
......@@ -26,8 +27,21 @@ public interface MesApiService {
*
* @return
*/
@POST("/himes/api/workOrder/show/pageWorkOrder.json")
Observable<BaseMesBean> ticketList(@Body RequestBody requestBody);
@POST("/himes/api/msWorkOrder/show/page.json")
Observable<BaseMesBean> ticketList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 新增
*
* @return
*/
@POST("/himes/api/msWorkOrder/save.json")
Observable<BaseMesBean> tickeAdd(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 功能
*
* @return
*/
@POST("/himes/api/msJobTypeInfo/show/list.json")
Observable<BaseMesBean> jobType(@Query("functionId") String functionId, @Body RequestBody requestBody);
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailActivity.java
浏览文件 @ d7c8b8d5
......@@ -11,11 +11,21 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.mesBean.JobTypeBean;
import com.wd.workoffice.bean.mesBean.TicketBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.JobTypeAdapter;
import com.wd.workoffice.util.WorkUtils;
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;
......@@ -49,6 +59,10 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
TextView tvManager;
@BindView(R.id.rl_manager)
RelativeLayout rlManager;
@BindView(R.id.tv_clazz)
TextView tvClazz;
@BindView(R.id.rv_clazz)
RecyclerView rvClazz;
@BindView(R.id.tv_desc)
TextView tvDesc;
@BindView(R.id.tv_person)
......@@ -57,10 +71,10 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
TextView tvStartTime;
@BindView(R.id.tv_end_time)
TextView tvEndTime;
@BindView(R.id.tv_create_person)
TextView tvCreatePerson;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.rl_time)
RelativeLayout rlTime;
@BindView(R.id.tv_take_on)
TextView tvTakeOn;
@BindView(R.id.rl_log)
......@@ -68,6 +82,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
@BindView(R.id.rl_add_log)
RelativeLayout rlAddLog;
private AccountBean dataBean;
private TicketBean.ListBean data;
@Override
protected void initView() {
......@@ -76,10 +91,56 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
if (TextUtils.equals(from, "1")) {
llBottom.setVisibility(View.VISIBLE);
}
rvClazz.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
tvCode.setText(data.getJobNo());
tvClient.setText(data.getCustomerUserName());
tvCompany.setText(data.getSalesCompanyName());
tvManager.setText(data.getSalesManagerName());
tvClazz.setText(data.getJobTypeName());
tvDesc.setText(data.getJobDescription());
if (!TextUtils.isEmpty(data.getPeopleCount()))
tvPerson.setText(data.getPeopleCount());
tvStartTime.setText(data.getPlanBeginDate());
tvEndTime.setText(data.getPlanEndDate());
tvCreatePerson.setText(data.getCreateUserName());
tvTime.setText(data.getCreateDateTime());
tvTime.setText(data.getCreateDateTime());
tvTakeOn.setText(data.getJobUserName());
}
private void getType(String id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("jobTypeCode", id);
RtfUtils.getMesRtf().jobType("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<JobTypeBean> jobTypeList = JSON.parseArray(data.getData().toString(), JobTypeBean.class);
JobTypeAdapter jobTypeAdapter = new JobTypeAdapter(R.layout.item_job_type, jobTypeList);
jobTypeAdapter.bindToRecyclerView(rvClazz);
}
});
}
@Override
protected void initData() {
getType(data.getJobTypeId());
getData();
}
......@@ -139,5 +200,4 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailFinishActivity.java
浏览文件 @ d7c8b8d5
package com.wd.workoffice.ui.activity.mes.ticket;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
......@@ -16,11 +13,11 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.mesBean.TicketBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ImgAdapter;
import com.wd.workoffice.ui.adapter.StarAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -57,6 +54,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
private AccountBean dataBean;
private List<Object> imgList;
private ImgAdapter imgAdapter;
private TicketBean.ListBean data;
@Override
protected void initView() {
......@@ -66,6 +64,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
@Override
protected void initData() {
data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
imgList = new ArrayList<>();
imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
imgAdapter.bindToRecyclerView(rvImg);
......@@ -103,7 +102,6 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
private void getData() {
RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java
浏览文件 @ d7c8b8d5
......@@ -120,7 +120,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
}
private void getData() {
RtfUtils.getMesRtf().ticketList(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
RtfUtils.getMesRtf().ticketList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......@@ -173,7 +173,14 @@ public class MesTicketListActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesTicketDetailFinishActivity.class);
switch (dataList.get(position).getJobStatus()) {
case 1:
startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));
break;
case 2:
startActivity(MesTicketDetailFinishActivity.class, "data", JSON.toJSONString(dataList.get(position)));
break;
}
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java
浏览文件 @ d7c8b8d5
......@@ -117,7 +117,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
}
private void getData() {
RtfUtils.getMesRtf().ticketList(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
RtfUtils.getMesRtf().ticketList("1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java
浏览文件 @ d7c8b8d5
......@@ -133,7 +133,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
}
private void getData() {
RtfUtils.getMesRtf().ticketList(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
RtfUtils.getMesRtf().ticketList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/JobTypeAdapter.java 0 → 100644
浏览文件 @ d7c8b8d5
package com.wd.workoffice.ui.adapter;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.bean.mesBean.JobTypeBean;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.widget.AddAndReduceDoubleView;
import org.greenrobot.eventbus.EventBus;
import java.util.List;
import flexible.xd.android_base.utils.ToastUtil;
/**
* Created by flexible on 2018/8/13.
*/
public class JobTypeAdapter extends BaseQuickAdapter<JobTypeBean, BaseViewHolder> {
public JobTypeAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, JobTypeBean item) {
helper.setText(R.id.tv_name, item.getJobTypeContentName());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesTicketAdapter.java
浏览文件 @ d7c8b8d5
......@@ -24,10 +24,10 @@ public class MesTicketAdapter extends BaseQuickAdapter<TicketBean.ListBean, Base
@Override
protected void convert(BaseViewHolder helper, TicketBean.ListBean item) {
helper.setText(R.id.tv_name, item.getAssetName());
helper.setText(R.id.tv_pro_name, item.getFailureName());
helper.setText(R.id.tv_status, item.getStatus() + "");
helper.setText(R.id.tv_time, TimeUtils.millis2String(item.getCreateDateTime()));
helper.setText(R.id.tv_name, item.getCustomerUserName());
helper.setText(R.id.tv_pro_name, item.getJobTypeName());
helper.setText(R.id.tv_status, item.getJobStatus() + "");
helper.setText(R.id.tv_time, item.getCreateDateTime());
}
}
app/src/main/res/layout/activity_mes_ticket_detail.xml
浏览文件 @ d7c8b8d5
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
......@@ -52,7 +53,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="任务单号:"
android:text="任务单号"
android:textSize="14sp" />
<TextView
......@@ -87,7 +88,6 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
......@@ -116,7 +116,6 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
......@@ -145,7 +144,6 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
......@@ -173,6 +171,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/tv_clazz"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3mm"
......@@ -180,6 +179,7 @@
android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_clazz"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
......@@ -236,7 +236,6 @@
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:hint="请输入"
android:padding="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
......@@ -254,7 +253,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="计划开始时间"
android:text="计划时间"
android:textSize="14sp" />
<LinearLayout
......@@ -307,12 +306,12 @@
<TextView
android:id="@+id/tv_create_person"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="20mm"
android:layout_marginRight="3mm"
android:gravity="center"
android:padding="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
......@@ -321,7 +320,6 @@
<View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
......@@ -341,7 +339,6 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
......@@ -369,7 +366,6 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
......
app/src/main/res/layout/item_job_type.xml 0 → 100644
浏览文件 @ d7c8b8d5
<?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="wrap_content"
android:layout_marginTop="10mm"
android:orientation="vertical">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</RelativeLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论