Skip to content

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

1.历史数据 

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 25c34185
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 739 行增加 和 5 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ e2bbe84e
...@@ -2119,7 +2119,47 @@ ...@@ -2119,7 +2119,47 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.history.HistoryActivity"
android:configChanges="keyboardHidden|orientation"
android:label="历史用户数据采集"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.history.HistoryDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="历史用户数据采集详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.history.HistoryOtherSupplierDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="其他供货商供货情况"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.history.HistoryThreeDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="连铸三大件详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.history.HistoryPackageDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="其他中包耐材记录情况"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider" android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/bean/mesBean/UserDataBean.java
浏览文件 @ e2bbe84e
...@@ -92,7 +92,7 @@ public class UserDataBean extends BaseMesPageBean { ...@@ -92,7 +92,7 @@ public class UserDataBean extends BaseMesPageBean {
private String salesManagerCode; private String salesManagerCode;
private String salesManagerName; private String salesManagerName;
private String steelmakingInfoCode; private String steelmakingInfoCode;
private Object feedbackDateTime; private String feedbackDateTime;
private String createUserId; private String createUserId;
private Object createUserName; private Object createUserName;
private String updateUserId; private String updateUserId;
...@@ -114,6 +114,15 @@ public class UserDataBean extends BaseMesPageBean { ...@@ -114,6 +114,15 @@ public class UserDataBean extends BaseMesPageBean {
private String continuousCasterCode; private String continuousCasterCode;
private String continuousCasterType; private String continuousCasterType;
private Object delete; private Object delete;
private String msVersion;
public String getMsVersion() {
return msVersion;
}
public void setMsVersion(String msVersion) {
this.msVersion = msVersion;
}
public String getContinuousCasterCode() { public String getContinuousCasterCode() {
return continuousCasterCode; return continuousCasterCode;
...@@ -211,11 +220,11 @@ public class UserDataBean extends BaseMesPageBean { ...@@ -211,11 +220,11 @@ public class UserDataBean extends BaseMesPageBean {
this.steelmakingInfoCode = steelmakingInfoCode; this.steelmakingInfoCode = steelmakingInfoCode;
} }
public Object getFeedbackDateTime() { public String getFeedbackDateTime() {
return feedbackDateTime; return feedbackDateTime;
} }
public void setFeedbackDateTime(Object feedbackDateTime) { public void setFeedbackDateTime(String feedbackDateTime) {
this.feedbackDateTime = feedbackDateTime; this.feedbackDateTime = feedbackDateTime;
} }
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ e2bbe84e
...@@ -510,5 +510,53 @@ public interface MesApiService { ...@@ -510,5 +510,53 @@ public interface MesApiService {
@POST("/himes/api/scrapAnalysis/show/list.json") @POST("/himes/api/scrapAnalysis/show/list.json")
Observable<BaseMesBean> scrapAnalysisList(@Query("functionId") String functionId, @Body RequestBody requestBody); Observable<BaseMesBean> scrapAnalysisList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/msSceneFeedbackHistory/showProducts.json")
Observable<BaseMesBean> historyProductList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/msSceneFeedbackHistory/showSupply.json")
Observable<BaseMesBean> historySupplyList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 其他中包耐材记录根据ID获取
* @return
*/
@POST("/himes/api/msSceneFeedbackHistory/showRef.json")
Observable<BaseMesBean> historyRefList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 炼钢厂详情
* @return
*/
@POST("/himes/api/msSceneFeedbackHistory/show/getBySteel.json")
Observable<BaseMesBean> historySteelList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 连铸机详情
* @return
*/
@POST("/himes/api/msSceneFeedbackHistory/show/getByCaster.json")
Observable<BaseMesBean> historyCasterList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 首页列表
* @return
*/
@POST("/himes/api/msSceneFeedbackHistory/show/page.json")
Observable<BaseMesBean> historyList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 用户信息采集历史详情
* @return
*/
@POST("/himes/api/msSceneFeedbackHistory/show/getByFeedInfo.json")
Observable<BaseMesBean> historyDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/history/HistoryActivity.java 0 → 100644
浏览文件 @ e2bbe84e
package com.wd.workoffice.ui.activity.mes.history;
import android.content.Intent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.user.MesUserDataAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesUserDataConditionActivity;
import com.wd.workoffice.ui.activity.mes.user.MesUserDataDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesUserDataListCheckActivity;
import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
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;
import androidx.annotation.Nullable;
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 HistoryActivity extends WorkToolBarActivity {
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
@BindView(R.id.tv_go)
TextView tvGo;
@BindView(R.id.btn_add)
Button btnAdd;
private int page = 1;
private Map<String, Object> param;
private List<UserDataBean.ListBean> dataList;
private MesUserDataAdapter dataAdapter;
private JSONArray permission;
@Override
protected void initView() {
ButterKnife.bind(this);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
tvGo.setVisibility(View.GONE);
btnAdd.setVisibility(View.GONE);
}
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new MesUserDataAdapter(R.layout.item_mes_user_data, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageMesKey();
param.put("pageNum", page);
getData();
}
private void getButtonPermission() {
RtfUtils.getMesRtf().buttonPermission(WorkUtils.getMesMenuId("市场服务","用户数据采集")).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;
}
permission = JSON.parseArray(data.getData().toString());
}
});
}
private void getData() {
getButtonPermission();
RtfUtils.getMesRtf().historyList("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<UserDataBean.ListBean> getList = JSON.parseObject(data.getData().toString(), UserDataBean.class).getList();
if (page == 1) {
srlRefresh.finishRefresh();
dataList.clear();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
} else {
dataAdapter.loadMoreComplete();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
dataAdapter.loadMoreEnd();
} else {
page++;
}
}
});
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("pageNum", page);
getData();
});
dataAdapter.setOnLoadMoreListener(() -> {
param.put("pageNum", page);
getData();
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// boolean isJob = TextUtils.equals(UserKeeper.getInstance().getMesUid(), dataList.get(position).getApprovalUserId());
startActivity(HistoryDetailActivity.class,"from","1",
"id", dataList.get(position).getId(),
"feedback", dataList.get(position).getFeedbackInfoNo(),
"version", dataList.get(position).getMsVersion(),
"status", dataList.get(position).getApprovalStatus()+"",
"permission",permission.toJSONString());
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_list;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_mes_search, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivityForResult(MesUserDataConditionActivity.class, 10001);
break;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
String returnParam = data.getStringExtra("param");
param.put("paramMap", JSON.parseObject(returnParam,Map.class));
page = 1;
param.put("pageNum", page);
getData();
}
}
@OnClick({R.id.tv_go, R.id.btn_add})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_go:
startActivity(MesUserDataListCheckActivity.class);
finish();
break;
case R.id.btn_add:
startActivity(MesUserDataAddActivity.class);
break;
}
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(AddUserDataEvent event) {
page = 1;
param.put("pageNum", page);
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/history/HistoryOtherSupplierDetailActivity.java 0 → 100644
浏览文件 @ e2bbe84e
package com.wd.workoffice.ui.activity.mes.history;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.ImageBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ImgAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.GridLayoutManager;
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 HistoryOtherSupplierDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_years)
TextView tvYears;
@BindView(R.id.tv_supply_num)
TextView tvSupplyNum;
@BindView(R.id.tv_stock_num)
TextView tvStockNum;
@BindView(R.id.tv_content)
TextView tvContent;
@BindView(R.id.rv_img)
RecyclerView rvImg;
@BindView(R.id.tv_remark)
TextView tvRemark;
private MachineDetailBean.OtherSupListBean dataBean;
private List<ImageBean> imgList;
private ImgAdapter imgAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
rvImg.setLayoutManager(new GridLayoutManager(this, 3, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
imgList = new ArrayList<>();
imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
imgAdapter.bindToRecyclerView(rvImg);
getData();
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_other_supplier_detail;
}
private void getData() {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("id", getIntent().getStringExtra("id"));
param.put("feedbackInfoNo", getIntent().getStringExtra("feedback"));
param.put("msVersion", getIntent().getStringExtra("version"));
RtfUtils.getMesRtf().historySupplyList("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;
}
dataBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.OtherSupListBean.class);
imgList.addAll(dataBean.getAttachments());
imgAdapter.notifyDataSetChanged();
tvName.setText(dataBean.getSupplierName());
tvSupplyNum.setText(dataBean.getSupplyNumber());
tvStockNum.setText(dataBean.getStockNumber());
tvYears.setText(dataBean.getUseLife());
tvContent.setText(dataBean.getOtherSituationDescription());
tvRemark.setText(dataBean.getRemark());
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/history/HistoryPackageDetailActivity.java 0 → 100644
浏览文件 @ e2bbe84e
package com.wd.workoffice.ui.activity.mes.history;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.ImageBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ImgAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.GridLayoutManager;
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 HistoryPackageDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_pro)
TextView tvPro;
@BindView(R.id.rl_pro)
RelativeLayout rlPro;
@BindView(R.id.et_img_code)
TextView etImgCode;
@BindView(R.id.tv_materials)
TextView tvMaterials;
@BindView(R.id.tv_requirements)
TextView tvRequirements;
@BindView(R.id.tv_years)
TextView tvYears;
@BindView(R.id.tv_content)
TextView tvContent;
@BindView(R.id.rv_img)
RecyclerView rvImg;
@BindView(R.id.tv_remark)
TextView tvRemark;
private MachineDetailBean.OtherLadleListBean dataBean;
private List<ImageBean> imgList;
private ImgAdapter imgAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
rvImg.setLayoutManager(new GridLayoutManager(this, 3, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
imgList = new ArrayList<>();
imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
imgAdapter.bindToRecyclerView(rvImg);
getData();
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_other_package_detail;
}
private void getData() {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("id", getIntent().getStringExtra("id"));
param.put("feedbackInfoNo", getIntent().getStringExtra("feedback"));
param.put("msVersion", getIntent().getStringExtra("version"));
RtfUtils.getMesRtf().historyRefList("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;
}
dataBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.OtherLadleListBean.class);
imgList.addAll(dataBean.getAttachments());
imgAdapter.notifyDataSetChanged();
tvPro.setText(dataBean.getRefractoryName());
etImgCode.setText(dataBean.getFigureNumber());
tvRequirements.setText(dataBean.getUseRequirement());
tvMaterials.setText(dataBean.getMaterialsUsed());
tvYears.setText(dataBean.getUseLife());
tvContent.setText(dataBean.getUseProblemFeedback());
tvRemark.setText(dataBean.getRemark());
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/history/HistoryThreeDetailActivity.java 0 → 100644
浏览文件 @ e2bbe84e
package com.wd.workoffice.ui.activity.mes.history;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.ImageBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ImgAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.GridLayoutManager;
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 HistoryThreeDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_pro)
TextView tvPro;
@BindView(R.id.rl_pro)
RelativeLayout rlPro;
@BindView(R.id.et_img_code)
TextView etImgCode;
@BindView(R.id.et_type)
TextView etType;
@BindView(R.id.et_spec)
TextView etSpec;
@BindView(R.id.tv_material)
TextView tvMaterial;
@BindView(R.id.tv_requirements)
TextView tvRequirements;
@BindView(R.id.tv_years)
TextView tvYears;
@BindView(R.id.tv_position)
TextView tvPosition;
@BindView(R.id.tv_baking_method)
TextView tvBakingMethod;
@BindView(R.id.tv_baking_temperature)
TextView tvBakingTemperature;
@BindView(R.id.tv_baking_time)
TextView tvBakingTime;
@BindView(R.id.rl_time)
RelativeLayout rlTime;
@BindView(R.id.tv_content)
TextView tvContent;
@BindView(R.id.rv_img)
RecyclerView rvImg;
@BindView(R.id.tv_remark)
TextView tvRemark;
private MachineDetailBean.ProductListBean dataBean;
private List<ImageBean> imgList;
private ImgAdapter imgAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
rvImg.setLayoutManager(new GridLayoutManager(this, 3, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
imgList = new ArrayList<>();
imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
imgAdapter.bindToRecyclerView(rvImg);
getData();
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_three_detail;
}
private void getData() {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("id", getIntent().getStringExtra("id"));
param.put("feedbackInfoNo", getIntent().getStringExtra("feedback"));
param.put("msVersion", getIntent().getStringExtra("version"));
RtfUtils.getMesRtf().historyProductList( "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;
}
dataBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.ProductListBean.class);
imgList.addAll(dataBean.getAttachments());
imgAdapter.notifyDataSetChanged();
tvPro.setText(dataBean.getProductsName());
etImgCode.setText(dataBean.getFigureNumber());
etSpec.setText(dataBean.getProductsStandards());
etType.setText(dataBean.getProductsType());
tvMaterial.setText(dataBean.getMaterialsUsed());
tvRequirements.setText(dataBean.getUseRequirement());
tvYears.setText(dataBean.getUseLife());
tvPosition.setText(dataBean.getSlagLineLocation());
tvBakingMethod.setText(dataBean.getBakingMethod());
tvBakingTime.setText(dataBean.getBakingDateTime()+"");
tvBakingTemperature.setText(dataBean.getBakingTemperature());
tvContent.setText(dataBean.getUseProblemFeedback());
tvRemark.setText(dataBean.getRemark());
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketActivity.java
浏览文件 @ e2bbe84e
...@@ -6,6 +6,7 @@ import android.widget.LinearLayout; ...@@ -6,6 +6,7 @@ import android.widget.LinearLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.mes.MesUserFileListActivity; import com.wd.workoffice.ui.activity.mes.MesUserFileListActivity;
import com.wd.workoffice.ui.activity.mes.history.HistoryActivity;
import com.wd.workoffice.ui.activity.mes.quality.MesQualityActivity; import com.wd.workoffice.ui.activity.mes.quality.MesQualityActivity;
import com.wd.workoffice.ui.activity.mes.search.MesSearchActivity; import com.wd.workoffice.ui.activity.mes.search.MesSearchActivity;
import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity; import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity;
...@@ -51,9 +52,12 @@ public class MesTicketActivity extends WorkToolBarActivity { ...@@ -51,9 +52,12 @@ public class MesTicketActivity extends WorkToolBarActivity {
return R.layout.activity_mes_ticket; return R.layout.activity_mes_ticket;
} }
@OnClick({R.id.ll_file,R.id.ll_ticket, R.id.ll_data, R.id.ll_quality, R.id.ll_search}) @OnClick({R.id.ll_history,R.id.ll_file,R.id.ll_ticket, R.id.ll_data, R.id.ll_quality, R.id.ll_search})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.ll_history:
startActivity(HistoryActivity.class);
break;
case R.id.ll_file: case R.id.ll_file:
startActivity(MesUserFileListActivity.class); startActivity(MesUserFileListActivity.class);
break; break;
......
app/src/main/java/com/wd/workoffice/ui/adapter/MesUserDataAdapter.java
浏览文件 @ e2bbe84e
...@@ -28,7 +28,7 @@ public class MesUserDataAdapter extends BaseQuickAdapter<UserDataBean.ListBean, ...@@ -28,7 +28,7 @@ public class MesUserDataAdapter extends BaseQuickAdapter<UserDataBean.ListBean,
@Override @Override
protected void convert(BaseViewHolder helper, UserDataBean.ListBean item) { protected void convert(BaseViewHolder helper, UserDataBean.ListBean item) {
helper.setText(R.id.tv_time, item.getApprovalDateTime()); helper.setText(R.id.tv_time, item.getFeedbackDateTime());
helper.setText(R.id.tv_client, item.getCustomerUserName()); helper.setText(R.id.tv_client, item.getCustomerUserName());
helper.setText(R.id.tv_factory, item.getSteelmakingWorksName()); helper.setText(R.id.tv_factory, item.getSteelmakingWorksName());
helper.setText(R.id.tv_machine, item.getContinuousCasterName()); helper.setText(R.id.tv_machine, item.getContinuousCasterName());
......
app/src/main/res/layout/activity_mes_ticket.xml
浏览文件 @ e2bbe84e
...@@ -125,4 +125,28 @@ ...@@ -125,4 +125,28 @@
android:layout_height="20mm" android:layout_height="20mm"
android:background="@mipmap/arrow_right_my" /> android:background="@mipmap/arrow_right_my" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/ll_history"
style="@style/llStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:text="历史用户数据采集"
android:textSize="16sp" />
<ImageView
android:layout_width="20mm"
android:layout_height="20mm"
android:background="@mipmap/arrow_right_my" />
</LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论