Skip to content

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

1.详情展示 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改,
上级 0c056c58
隐藏空白字符变更
内嵌 并排
正在显示 包含 86 行增加 和 16 行删除
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ cfcae5d0
......@@ -17,10 +17,14 @@ import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.event.AddUserDataEvent;
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.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;
......@@ -161,6 +165,12 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
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;
@Override
protected void initView() {
......@@ -169,6 +179,10 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData4.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
......@@ -185,6 +199,16 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
dataFactory1List = new ArrayList<>();
dataFactory2List = new ArrayList<>();
dataFactory3List = new ArrayList<>();
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();
}
......@@ -231,10 +255,54 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
}
}
getMachineData(userDataDetailBean.getSteelInfo().getContinuousCasterCode());
getFactoryData(userDataDetailBean.getSteelInfo().getSteelmakingWorksCode());
}
});
}
private void getFactoryData(String code) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("steelmakingWorksCode", code);
RtfUtils.getMesRtf().factoryDetail("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.getMsg());
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.addAll(factoryDetailBean.getSteelFurnList());
factory1Adapter.notifyDataSetChanged();
}
if (factoryDetailBean.getSteelRefFurnList() != null) {
dataFactory2List.addAll(factoryDetailBean.getSteelRefFurnList());
factory2Adapter.notifyDataSetChanged();
}
if (factoryDetailBean.getSteelLadleList() != null) {
dataFactory3List.addAll(factoryDetailBean.getSteelLadleList());
factory3Adapter.notifyDataSetChanged();
}
}
});
}
private void getMachineData(String code) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("continuousCasterCode", code);
......
app/src/main/res/layout/activity_mes_user_data_detail.xml
浏览文件 @ cfcae5d0
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
......@@ -283,17 +283,18 @@
<View style="@style/dividerX" />
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:id="@+id/tv_factory_desc1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="炼钢炉"
android:textSize="15sp" />
......@@ -302,13 +303,14 @@
android:id="@+id/rv_factory_data1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" />
</RelativeLayout>
/>
</LinearLayout>
<View style="@style/dividerX" />
<RelativeLayout
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -318,8 +320,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="精炼炉"
android:id="@+id/tv_factory_desc2"
android:textSize="15sp" />
......@@ -327,12 +329,13 @@
android:id="@+id/rv_factory_data2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" />
</RelativeLayout>
/>
</LinearLayout>
<View style="@style/dividerX" />
<RelativeLayout
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -342,8 +345,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="钢包"
android:id="@+id/tv_factory_desc3"
android:textSize="15sp" />
......@@ -351,8 +354,8 @@
android:id="@+id/rv_factory_data3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" />
</RelativeLayout>
/>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
......@@ -379,7 +382,6 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
......@@ -1173,4 +1175,4 @@
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
\ No newline at end of file
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论