Skip to content

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

1.用户反馈炼钢厂详情 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改
上级 25f9eb5d
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 306 行增加 和 156 行删除
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ a5189841
......@@ -164,4 +164,12 @@ public interface MesApiService {
*/
@POST("/himes/api/msSteelmakingWorks/show/list.json")
Observable<BaseMesBean> factoryList(@Query("functionId") String functionId, @Query("customerUserCode") String customerUserCode, @Body RequestBody requestBody);
/**
* 炼钢厂列表查询
*
* @return
*/
@POST("/himes/api/msSteelmakingWorks/show/getBySteel.json")
Observable<BaseMesBean> factoryDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.java
浏览文件 @ a5189841
......@@ -113,11 +113,11 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
// intent.putExtra("clientName", clientList.get(position).getName());
// intent.putExtra("id", clientList.get(position).getId());
setResult(10001, intent);
finish();
data.setSteelmakingWorksName(clientList.get(position).getSteelmakingWorksName());
data.setSteelmakingWorksCode(clientList.get(position).getSteelmakingWorksCode());
startActivity(MesUserDataAdd3Activity.class,
"data", JSON.toJSONString(data)
);
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd3Activity.java
浏览文件 @ a5189841
......@@ -9,15 +9,20 @@ 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.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
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.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
......@@ -35,48 +40,59 @@ import io.reactivex.disposables.Disposable;
* github: https://github.com/FlexibleXd
**/
public class MesUserDataAdd3Activity extends WorkToolBarActivity {
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.tv_factory)
TextView tvFactory;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
@BindView(R.id.tv_sum)
TextView tvSum;
@BindView(R.id.tv_type)
TextView tvType;
@BindView(R.id.rv_data1)
RecyclerView rvData1;
@BindView(R.id.rv_data2)
RecyclerView rvData2;
@BindView(R.id.tv_factory)
TextView tvFactory;
@BindView(R.id.rl_factory)
RelativeLayout rlFactory;
private AccountBean dataBean;
@BindView(R.id.rv_data3)
RecyclerView rvData3;
@BindView(R.id.tv_machine)
TextView tvMachine;
@BindView(R.id.rl_machine)
RelativeLayout rlMachine;
private UserDataBean.ListBean data;
private List<FactoryDetailBean.SteelFurnListBean> data1List;
private List<FactoryDetailBean.SteelRefFurnListBean> data2List;
private List<FactoryDetailBean.SteelLadleListBean> data3List;
private UserDataAdd3Adapter data1Adapter;
private UserDataAdd3RefAdapter data2Adapter;
private UserDataAdd3LabelAdapter data3Adapter;
@Override
protected void initView() {
ButterKnife.bind(this);
rvData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
List<Object> data1List = new ArrayList<>();
data1List.add(null);
data1List.add(null);
data1List.add(null);
List<Object> data2List = new ArrayList<>();
data2List.add(null);
data2List.add(null);
data2List.add(null);
UserDataAdd3Adapter data1Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3, data1List);
UserDataAdd3Adapter data2Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3, data2List);
data = JSON.parseObject(getIntent().getStringExtra("data"), UserDataBean.ListBean.class);
data1List = new ArrayList<>();
data2List = new ArrayList<>();
data3List = new ArrayList<>();
data1Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3, data1List);
data2Adapter = new UserDataAdd3RefAdapter(R.layout.item_user_add3, data2List);
data3Adapter = new UserDataAdd3LabelAdapter(R.layout.item_add3_label, data3List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
// getData();
data3Adapter.bindToRecyclerView(rvData3);
getData();
}
private void getData() {
RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("steelmakingWorksCode", data.getSteelmakingWorksCode());
RtfUtils.getMesRtf().factoryDetail("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......@@ -88,17 +104,32 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
}
@Override
public void onSuccess(BaseBean data) {
public void onSuccess(BaseMesBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
if (!data.isSuccess()) {
toast(data.getMsg());
return;
}
dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
// tvName.setText(dataBean.getName());
// tvDpeName.setText(dataBean.getName());
// tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
// tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
FactoryDetailBean factoryDetailBean = JSON.parseObject(data.getData().toString(), FactoryDetailBean.class);
FactoryDetailBean.SteelWorksBean steelWorks = factoryDetailBean.getSteelWorks();
if (steelWorks != null) {
tvSum.setText(steelWorks.getAnnualOutput());
tvFactory.setText(steelWorks.getSteelmakingWorksName());
tvType.setText(steelWorks.getSteelGrade());
}
if (factoryDetailBean.getSteelFurnList() != null) {
data1List.addAll(factoryDetailBean.getSteelFurnList());
data1Adapter.notifyDataSetChanged();
}
if (factoryDetailBean.getSteelRefFurnList() != null) {
data2List.addAll(factoryDetailBean.getSteelRefFurnList());
data2Adapter.notifyDataSetChanged();
}
if (factoryDetailBean.getSteelLadleList() != null) {
data3List.addAll(factoryDetailBean.getSteelLadleList());
data3Adapter.notifyDataSetChanged();
}
}
});
}
......@@ -140,7 +171,7 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
}
@OnClick(R.id.rl_factory)
@OnClick(R.id.rl_machine)
public void onViewClicked() {
startActivityForResult(MesChooseMachineActivity.class, 10001);
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3Adapter.java
浏览文件 @ a5189841
......@@ -6,6 +6,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import java.util.List;
......@@ -13,7 +14,7 @@ import java.util.List;
* Created by flexible on 2018/8/13.
*/
public class UserDataAdd3Adapter extends BaseQuickAdapter<Object, BaseViewHolder> {
public class UserDataAdd3Adapter extends BaseQuickAdapter<FactoryDetailBean.SteelFurnListBean, BaseViewHolder> {
public UserDataAdd3Adapter(int layoutResId, List data) {
super(layoutResId, data);
......@@ -21,7 +22,7 @@ public class UserDataAdd3Adapter extends BaseQuickAdapter<Object, BaseViewHolder
@Override
protected void convert(BaseViewHolder helper, Object item) {
protected void convert(BaseViewHolder helper, FactoryDetailBean.SteelFurnListBean item) {
View content = helper.getView(R.id.ll_content);
helper.setOnClickListener(R.id.rl_title, new View.OnClickListener() {
@Override
......@@ -33,7 +34,9 @@ public class UserDataAdd3Adapter extends BaseQuickAdapter<Object, BaseViewHolder
}
}
});
helper.setText(R.id.tv_name, item.getSteelmakingFurnaceCode());
helper.setText(R.id.tv_content1, item.getType());
helper.setText(R.id.tv_content2, item.getCapacity());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3LabelAdapter.java 0 → 100644
浏览文件 @ a5189841
package com.wd.workoffice.ui.adapter;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import java.util.List;
import flexible.xd.android_base.utils.TimeUtils;
/**
* Created by flexible on 2018/8/13.
*/
public class UserDataAdd3LabelAdapter extends BaseQuickAdapter<FactoryDetailBean.SteelLadleListBean, BaseViewHolder> {
public UserDataAdd3LabelAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, FactoryDetailBean.SteelLadleListBean item) {
View content = helper.getView(R.id.ll_content);
helper.setOnClickListener(R.id.rl_title, new View.OnClickListener() {
@Override
public void onClick(View v) {
if (content.getVisibility() == View.VISIBLE) {
content.setVisibility(View.GONE);
} else {
content.setVisibility(View.VISIBLE);
}
}
});
helper.setText(R.id.tv_name, item.getLadleCode());
helper.setText(R.id.tv_content1, item.getCapacity());
helper.setText(R.id.tv_content2, item.getTemperatureRange());
helper.setText(R.id.tv_content3, TimeUtils.millis2String(item.getCastingDateTime()));
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3RefAdapter.java 0 → 100644
浏览文件 @ a5189841
package com.wd.workoffice.ui.adapter;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class UserDataAdd3RefAdapter extends BaseQuickAdapter<FactoryDetailBean.SteelRefFurnListBean, BaseViewHolder> {
public UserDataAdd3RefAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, FactoryDetailBean.SteelRefFurnListBean item) {
View content = helper.getView(R.id.ll_content);
helper.setOnClickListener(R.id.rl_title, new View.OnClickListener() {
@Override
public void onClick(View v) {
if (content.getVisibility() == View.VISIBLE) {
content.setVisibility(View.GONE);
} else {
content.setVisibility(View.VISIBLE);
}
}
});
helper.setText(R.id.tv_desc1, "型号和台数");
helper.setText(R.id.tv_desc2, "钙处理方式");
helper.setText(R.id.tv_name, item.getRefiningFurnaceCode());
helper.setText(R.id.tv_content1, item.getModelNumber());
helper.setText(R.id.tv_content2, item.getCalciumTreatmentSituation());
}
}
app/src/main/res/layout/activity_mes_user_data_add3.xml
浏览文件 @ a5189841
......@@ -21,17 +21,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="客户"
android:text="炼钢厂"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_client"
android:id="@+id/tv_factory"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textSize="14sp" />
</RelativeLayout>
......@@ -49,16 +48,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="销售公司"
android:text="年产量"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_sum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textSize="14sp" />
</RelativeLayout>
......@@ -76,16 +75,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="销售经理"
android:text="钢种"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textSize="14sp" />
</RelativeLayout>
......@@ -102,116 +101,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="10mm" />
<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">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="钢包"
android:textSize="14sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<LinearLayout
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="容量"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="温度范围"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="每炉浇铸时间"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
android:layout_marginTop="10mm" />
<RelativeLayout
android:id="@+id/rl_factory"
android:id="@+id/rl_machine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
......@@ -233,7 +130,7 @@
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_factory"
android:id="@+id/tv_machine"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
......
app/src/main/res/layout/item_add3_label.xml 0 → 100644
浏览文件 @ a5189841
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="钢包"
android:textSize="14sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="容量"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_content1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="温度范围"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_content2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="每炉浇铸时间"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_content3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_user_add3.xml
浏览文件 @ a5189841
......@@ -14,6 +14,7 @@
android:paddingVertical="9mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
......@@ -44,6 +45,7 @@
android:paddingLeft="25mm">
<TextView
android:id="@+id/tv_desc1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
......@@ -53,11 +55,11 @@
<TextView
android:id="@+id/tv_content1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textSize="14sp" />
</RelativeLayout>
......@@ -69,6 +71,7 @@
android:paddingLeft="25mm">
<TextView
android:id="@+id/tv_desc2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
......@@ -78,11 +81,11 @@
<TextView
android:id="@+id/tv_content2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论