Skip to content

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

1.历史数据 

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 25c34185
显示空白字符变更
内嵌 并排
正在显示 包含 1381 行增加 和 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/HistoryDetailActivity.java 0 → 100644
浏览文件 @ e2bbe84e
package com.wd.workoffice.ui.activity.mes.history;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
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.event.AddUserDataEvent;
import com.wd.workoffice.bean.event.ModifyUserDataEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.user.MesMiddleAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesMiddleDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesOtherSupplierAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesOtherSupplierDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesPackageAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesPackageDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesSpeedAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesSpeedDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesStockAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesStockDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesSupplierActivity;
import com.wd.workoffice.ui.activity.mes.user.MesSupplierAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesThreeAddActivity;
import com.wd.workoffice.ui.activity.mes.user.MesThreeDetailActivity;
import com.wd.workoffice.ui.activity.mes.user.MesUserDataDetailModifyActivity;
import com.wd.workoffice.ui.adapter.UserDataAdd3Adapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter;
import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
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.appcompat.app.AlertDialog;
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 HistoryDetailActivity extends WorkToolBarActivity {
@BindView(R.id.btn_refuse)
Button btnRefuse;
@BindView(R.id.btn_agree)
Button btnReviews;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.tv_reason)
TextView tvReason;
@BindView(R.id.ll_reason)
LinearLayout llReason;
@BindView(R.id.iv_modify_client)
ImageView ivModifyClient;
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
@BindView(R.id.tv_sale)
TextView tvSale;
@BindView(R.id.tv_manager)
TextView tvManager;
@BindView(R.id.iv_modify_steel)
ImageView ivModifySteel;
@BindView(R.id.tv_factory)
TextView tvFactory;
@BindView(R.id.tv_num)
TextView tvNum;
@BindView(R.id.tv_type)
TextView tvType;
@BindView(R.id.rv_factory_data1)
RecyclerView rvFactoryData1;
@BindView(R.id.rv_factory_data2)
RecyclerView rvFactoryData2;
@BindView(R.id.rv_factory_data3)
RecyclerView rvFactoryData3;
@BindView(R.id.iv_modify_machine)
ImageView ivModifyMachine;
@BindView(R.id.tv_machine_type)
TextView tvMachineType;
@BindView(R.id.tv_section)
TextView tvSection;
@BindView(R.id.tv_steel_type)
TextView tvSteelType;
@BindView(R.id.tv_speed)
TextView tvSpeed;
@BindView(R.id.rl_middle)
RelativeLayout rlMiddle;
@BindView(R.id.tv_middle1)
TextView tvMiddle1;
@BindView(R.id.tv_middle2)
TextView tvMiddle2;
@BindView(R.id.tv_middle3)
TextView tvMiddle3;
@BindView(R.id.tv_middle4)
TextView tvMiddle4;
@BindView(R.id.tv_middle5)
TextView tvMiddle5;
@BindView(R.id.tv_middle6)
TextView tvMiddle6;
@BindView(R.id.tv_middle7)
TextView tvMiddle7;
@BindView(R.id.tv_middle8)
TextView tvMiddle8;
@BindView(R.id.ll_middle)
LinearLayout llMiddle;
@BindView(R.id.rl_cover)
RelativeLayout rlCover;
@BindView(R.id.tv_cover1)
TextView tvCover1;
@BindView(R.id.tv_cover2)
TextView tvCover2;
@BindView(R.id.tv_cover3)
TextView tvCover3;
@BindView(R.id.tv_cover4)
TextView tvCover4;
@BindView(R.id.ll_cover)
LinearLayout llCover;
@BindView(R.id.rl_protection)
RelativeLayout rlProtection;
@BindView(R.id.tv_protection1)
TextView tvProtection1;
@BindView(R.id.tv_protection2)
TextView tvProtection2;
@BindView(R.id.tv_protection3)
TextView tvProtection3;
@BindView(R.id.tv_protection4)
TextView tvProtection4;
@BindView(R.id.ll_protection)
LinearLayout llProtection;
@BindView(R.id.rv_data1)
RecyclerView rvData1;
@BindView(R.id.tv_add1)
TextView tvAdd1;
@BindView(R.id.rv_data2)
RecyclerView rvData2;
@BindView(R.id.rv_data3)
RecyclerView rvData3;
@BindView(R.id.tv_add3)
TextView tvAdd3;
@BindView(R.id.rv_data4)
RecyclerView rvData4;
@BindView(R.id.tv_add4)
TextView tvAdd4;
@BindView(R.id.rl_add)
RelativeLayout rlAdd;
@BindView(R.id.tv_factory_desc1)
TextView tvFactoryDesc1;
@BindView(R.id.tv_factory_desc2)
TextView tvFactoryDesc2;
@BindView(R.id.tv_factory_desc3)
TextView tvFactoryDesc3;
@BindView(R.id.rv_data5)
RecyclerView rvData5;
@BindView(R.id.tv_add5)
TextView tvAdd5;
@BindView(R.id.rv_data6)
RecyclerView rvData6;
@BindView(R.id.tv_add6)
TextView tvAdd6;
@BindView(R.id.tv_add2)
TextView tvAdd2;
@BindView(R.id.tv_machine_name)
TextView tvMachineName;
@BindView(R.id.rv_data7)
RecyclerView rvData7;
@BindView(R.id.tv_add7)
TextView tvAdd7;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
private UserDataMachineAdapter data4Adapter;
private MachineDetailBean machineDetailBean;
private List<String> data1List;
private List<String> data2List;
private List<String> data3List;
private List<String> data4List;
private List<FactoryDetailBean.SteelFurnListBean> dataFactory1List;
private List<FactoryDetailBean.SteelRefFurnListBean> dataFactory2List;
private List<FactoryDetailBean.SteelLadleListBean> dataFactory3List;
private UserDataAdd3Adapter factory1Adapter;
private UserDataAdd3RefAdapter factory2Adapter;
private UserDataAdd3LabelAdapter factory3Adapter;
private UserDataMachineAdapter data5Adapter;
private UserDataMachineAdapter data6Adapter;
private UserDataMachineAdapter data7Adapter;
private List<String> data5List;
private List<String> data6List;
private List<String> data7List;
private UserDataDetailBean userDataDetailBean;
private Menu userDataMenu;
@Override
protected void initView() {
ButterKnife.bind(this);
ivModifyClient.setVisibility(View.GONE);
ivModifyMachine.setVisibility(View.GONE);
ivModifySteel.setVisibility(View.GONE);
tvAdd1.setVisibility(View.GONE);
tvAdd2.setVisibility(View.GONE);
tvAdd3.setVisibility(View.GONE);
tvAdd4.setVisibility(View.GONE);
tvAdd5.setVisibility(View.GONE);
tvAdd6.setVisibility(View.GONE);
tvAdd7.setVisibility(View.GONE);
rvData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData7.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
data1List = new ArrayList<>();
data2List = new ArrayList<>();
data3List = new ArrayList<>();
data4List = new ArrayList<>();
data5List = new ArrayList<>();
data6List = new ArrayList<>();
data7List = new ArrayList<>();
data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List);
data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List);
data3Adapter = new UserDataMachineAdapter(R.layout.item_machine, data3List);
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
data7Adapter = new UserDataMachineAdapter(R.layout.item_machine, data7List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
data6Adapter.bindToRecyclerView(rvData6);
data7Adapter.bindToRecyclerView(rvData7);
dataFactory1List = new ArrayList<>();
dataFactory2List = new ArrayList<>();
dataFactory3List = new ArrayList<>();
// factory1Adapter = new UserDataDetailFactory1Adapter(R.layout.item_user_detail_factory1, dataFactory1List);
// factory2Adapter = new UserDataDetailFactory2Adapter(R.layout.item_user_detail_factory2, dataFactory2List);
// factory3Adapter = new UserDataAdd3LabelAdapter(R.layout.item_add3_label, dataFactory3List);
factory1Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3, dataFactory1List);
factory2Adapter = new UserDataAdd3RefAdapter(R.layout.item_user_add3, dataFactory2List);
factory3Adapter = new UserDataAdd3LabelAdapter(R.layout.item_add3_label, dataFactory3List);
factory1Adapter.bindToRecyclerView(rvFactoryData1);
factory2Adapter.bindToRecyclerView(rvFactoryData2);
factory3Adapter.bindToRecyclerView(rvFactoryData3);
getData();
}
private void getData() {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("id", getIntent().getStringExtra("id"));
param.put("msVersion", getIntent().getStringExtra("version"));
RtfUtils.getMesRtf().historyDetail("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;
}
userDataDetailBean = JSON.parseObject(data.getData().toString(), UserDataDetailBean.class);
UserDataDetailBean.MainInfoBean mainInfo = userDataDetailBean.getMainInfo();
if (mainInfo != null) {
// isCanModify(mainInfo.getCustomerUserCode());
tvClient.setText(mainInfo.getCustomerUserName());
tvManager.setText(mainInfo.getSalesManagerName());
tvSale.setText(mainInfo.getSalesCompanyName());
// if (TextUtils.equals("1", getIntent().getStringExtra("from"))) {
// if (mainInfo.getApprovalStatus() != 0) {
// llBottom.setVisibility(View.GONE);
// } else {
// if (WorkUtils.hasMesMenuPermission(JSON.parseArray(getIntent().getStringExtra("permission")), "审核")) {
// llBottom.setVisibility(View.VISIBLE);
// }
// }
// } else {
// if (mainInfo.getApprovalStatus() == 2) {
// llReason.setVisibility(View.VISIBLE);
// tvReason.setText(mainInfo.getRemark());
// } else {
// llReason.setVisibility(View.GONE);
// }
// }
}
getMachineData(userDataDetailBean.getSteelInfo().getContinuousCasterCode());
getFactoryData(userDataDetailBean.getSteelInfo().getSteelmakingWorksCode());
}
});
}
private void getFactoryData(String code) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("steelmakingWorksCode", code);
param.put("feedbackInfoNo", getIntent().getStringExtra("feedback"));
param.put("msVersion", getIntent().getStringExtra("version"));
RtfUtils.getMesRtf().historySteelList ("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;
}
FactoryDetailBean factoryDetailBean = JSON.parseObject(data.getData().toString(), FactoryDetailBean.class);
FactoryDetailBean.SteelWorksBean steelWorks = factoryDetailBean.getSteelWorks();
if (steelWorks != null) {
tvNum.setText(steelWorks.getAnnualOutput());
tvFactory.setText(steelWorks.getSteelmakingWorksName());
tvType.setText(steelWorks.getSteelGrade());
}
if (factoryDetailBean.getSteelFurnList() != null) {
dataFactory1List.clear();
dataFactory1List.addAll(factoryDetailBean.getSteelFurnList());
factory1Adapter.notifyDataSetChanged();
}
if (factoryDetailBean.getSteelRefFurnList() != null) {
dataFactory2List.clear();
dataFactory2List.addAll(factoryDetailBean.getSteelRefFurnList());
factory2Adapter.notifyDataSetChanged();
}
if (factoryDetailBean.getSteelLadleList() != null) {
dataFactory3List.clear();
dataFactory3List.addAll(factoryDetailBean.getSteelLadleList());
factory3Adapter.notifyDataSetChanged();
}
}
});
}
private void getMachineData(String code) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("continuousCasterCode", code);
param.put("feedbackInfoNo", getIntent().getStringExtra("feedback"));
param.put("msVersion", getIntent().getStringExtra("version"));
RtfUtils.getMesRtf().historyCasterList("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;
}
machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
if (castInfo != null) {
tvMachineName.setText(castInfo.getContinuousCasterName());
tvMachineType.setText(castInfo.getContinuousCasterType());
tvSection.setText(castInfo.getFractureSurface());
tvSteelType.setText(castInfo.getSteelGrade());
tvSpeed.setText(castInfo.getCastingSpeed());
}
MachineDetailBean.CastLadleBean castLadle = machineDetailBean.getCastLadle();
if (castLadle != null) {
tvMiddle1.setText(castLadle.getCapacity());
tvMiddle2.setText(castLadle.getLifeSpan());
// tvMiddle3.setText(castLadle.getLadleCode());
tvMiddle4.setText(castLadle.getLiquidLevel());
tvMiddle5.setText(castLadle.getLiquidSteelTemperature());
tvMiddle6.setText(castLadle.getBakingMethod());
tvMiddle7.setText(castLadle.getBakingTemperature());
tvMiddle8.setText(String.valueOf(castLadle.getBakingDateTime()));
}
changeList();
}
});
}
private void changeList() {
data1List.clear();
data2List.clear();
data3List.clear();
data4List.clear();
data5List.clear();
data6List.clear();
data7List.clear();
if (machineDetailBean.getProductList() != null) {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName());
}
data1Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSupplyList() != null) {
for (MachineDetailBean.SupplyListBean productListBean : machineDetailBean.getSupplyList()) {
data2List.add(productListBean.getProductsName());
}
data2Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getOtherSupList() != null) {
for (MachineDetailBean.OtherSupListBean productListBean : machineDetailBean.getOtherSupList()) {
data3List.add(productListBean.getSupplierName());
}
data3Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getOtherLadleList() != null) {
for (MachineDetailBean.OtherLadleListBean productListBean : machineDetailBean.getOtherLadleList()) {
data4List.add(productListBean.getRefractoryName());
}
data4Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getStockList() != null) {
for (MachineDetailBean.StockListBean productListBean : machineDetailBean.getStockList()) {
data5List.add(productListBean.getProductsName());
}
data5Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSettleList() != null) {
for (MachineDetailBean.SettleListBean productListBean : machineDetailBean.getSettleList()) {
data6List.add(productListBean.getSettlementMethod());
}
data6Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSpeeds() != null) {
for (MachineDetailBean.SpeedsBean productListBean : machineDetailBean.getSpeeds()) {
data7List.add(productListBean.getSteelGrade());
}
data7Adapter.notifyDataSetChanged();
}
}
@Override
protected void initEvent() {
data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(HistoryThreeDetailActivity.class,
"id", machineDetailBean.getProductList().get(position).getId()
,"version", getIntent().getStringExtra("version"),
"feedback", getIntent().getStringExtra("feedback"));
}
});
data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSupplierActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
}
});
data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(HistoryOtherSupplierDetailActivity.class,
"id", machineDetailBean.getOtherSupList().get(position).getId()
,"version", getIntent().getStringExtra("version"),
"feedback", getIntent().getStringExtra("feedback"));
}
});
data4Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesPackageDetailActivity.class,
"id", machineDetailBean.getOtherLadleList().get(position).getId()
,"version", getIntent().getStringExtra("version"),
"feedback", getIntent().getStringExtra("feedback"));
}
});
data5Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesStockDetailActivity.class, "data", JSON.toJSONString(machineDetailBean.getStockList().get(position)));
}
});
data6Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesMiddleDetailActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
}
});
data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSpeedDetailActivity.class, "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position)));
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_detail;
}
@OnClick({R.id.tv_add7, R.id.tv_add5, R.id.tv_add6, R.id.btn_agree,
R.id.btn_refuse, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_add7:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add1:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesThreeAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add2:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add3:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add4:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesPackageAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add5:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesStockAddActivity.class,
"continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode()
, "id", userDataDetailBean.getMainInfo().getCustomerUserCode());
break;
case R.id.tv_add6:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.rl_add:
// startActivity(MesMiddleAddActivity.class);
break;
case R.id.btn_agree:
// openCheck(1);
break;
case R.id.btn_refuse:
// openCheck(2);
break;
case R.id.rl_middle:
if (llMiddle.getVisibility() == View.VISIBLE) {
llMiddle.setVisibility(View.GONE);
} else {
llMiddle.setVisibility(View.VISIBLE);
}
break;
case R.id.rl_cover:
if (llCover.getVisibility() == View.VISIBLE) {
llCover.setVisibility(View.GONE);
} else {
llCover.setVisibility(View.VISIBLE);
}
break;
case R.id.rl_protection:
if (llProtection.getVisibility() == View.VISIBLE) {
llProtection.setVisibility(View.GONE);
} else {
llProtection.setVisibility(View.VISIBLE);
}
break;
}
}
}
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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论