Skip to content

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

1.发货记录详情 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改,用户反馈 新增没通
上级 ff22892e
隐藏空白字符变更
内嵌 并排
正在显示 包含 52 行增加 和 68 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/MchineDetailBean.java → app/src/main/java/com/wd/workoffice/bean/mesBean/MachineDetailBean.java
浏览文件 @ d3088e47
......@@ -7,7 +7,7 @@ import java.util.List;
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MchineDetailBean {
public class MachineDetailBean {
/**
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java
浏览文件 @ d3088e47
package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
......@@ -14,11 +13,9 @@ 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.AddTicketEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.MachineBean;
import com.wd.workoffice.bean.mesBean.MchineDetailBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -40,8 +37,6 @@ import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/**
* 用户数据采集，连铸机详情
......@@ -127,7 +122,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
private List<String> data2List;
private List<String> data3List;
private List<String> data4List;
private MchineDetailBean machineDetailBean;
private MachineDetailBean machineDetailBean;
@Override
protected void initView() {
......@@ -177,15 +172,15 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
toast(data.getMsg());
return;
}
machineDetailBean = JSON.parseObject(data.getData().toString(), MchineDetailBean.class);
MchineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
if (castInfo != null) {
tvMachineType.setText(castInfo.getContinuousCasterName());
tvSection.setText(castInfo.getFractureSurface());
tvSteelType.setText(castInfo.getSteelGrade());
tvSpeed.setText(castInfo.getCastingSpeed());
}
MchineDetailBean.CastLadleBean castLadle = machineDetailBean.getCastLadle();
MachineDetailBean.CastLadleBean castLadle = machineDetailBean.getCastLadle();
if (castLadle != null) {
tvMiddle1.setText(castLadle.getCapacity());
tvMiddle2.setText(castLadle.getLifeSpan());
......@@ -196,14 +191,14 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
tvMiddle7.setText(castLadle.getBakingTemperature());
tvMiddle8.setText(TimeUtils.millis2String(castLadle.getBakingDateTime()));
}
MchineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent != null) {
tvCover1.setText(covAgent.getLadleCoveringAgentName());
tvCover2.setText(covAgent.getAcidAlkaliDegree());
tvCover3.setText(covAgent.getChemicalComposition());
tvCover4.setText(covAgent.getSupplierName());
}
MchineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu != null) {
tvProtection1.setText(mouldFlu.getMouldFluxesName());
tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
......@@ -223,25 +218,25 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data3List.clear();
data4List.clear();
if (machineDetailBean.getProductList() != null) {
for (MchineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName());
}
data1Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSupplyList() != null) {
for (MchineDetailBean.SupplyListBean productListBean : machineDetailBean.getSupplyList()) {
for (MachineDetailBean.SupplyListBean productListBean : machineDetailBean.getSupplyList()) {
data2List.add(productListBean.getProductsName());
}
data2Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getOtherSupList() != null) {
for (MchineDetailBean.OtherSupListBean productListBean : machineDetailBean.getOtherSupList()) {
for (MachineDetailBean.OtherSupListBean productListBean : machineDetailBean.getOtherSupList()) {
data3List.add(productListBean.getSupplierName());
}
data3Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getOtherLadleList() != null) {
for (MchineDetailBean.OtherLadleListBean productListBean : machineDetailBean.getOtherLadleList()) {
for (MachineDetailBean.OtherLadleListBean productListBean : machineDetailBean.getOtherLadleList()) {
data4List.add(productListBean.getRefractoryName());
}
data4Adapter.notifyDataSetChanged();
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesMiddleAddActivity.java
浏览文件 @ d3088e47
package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.EditText;
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.event.AddFactoryEvent;
import com.wd.workoffice.bean.mesBean.MchineDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
/**
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesSupplierActivity.java
浏览文件 @ d3088e47
package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
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.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import butterknife.BindView;
import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
/**
......@@ -19,7 +25,18 @@ import io.reactivex.disposables.Disposable;
* github: https://github.com/FlexibleXd
**/
public class MesSupplierActivity extends WorkToolBarActivity {
@BindView(R.id.tv_code)
TextView tvCode;
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_img_code)
TextView tvImgCode;
@BindView(R.id.tv_send_time)
TextView tvSendTime;
@BindView(R.id.tv_send_num)
TextView tvSendNum;
private AccountBean dataBean;
private MachineDetailBean.SupplyListBean data;
@Override
protected void initView() {
......@@ -28,38 +45,14 @@ public class MesSupplierActivity extends WorkToolBarActivity {
@Override
protected void initData() {
getData();
data = JSON.parseObject(getIntent().getStringExtra("data"), MachineDetailBean.SupplyListBean.class);
tvCode.setText(data.getProductsCode());
tvImgCode.setText(data.getFigureNumber ());
tvName.setText(data.getProductsName());
tvSendNum.setText(data.getDeliveryNumber());
tvSendTime.setText(TimeUtils.millis2String(data.getDeliveryDateTime()));
}
private void getData() {
RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
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()));
}
});
}
@Override
protected void initEvent() {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ d3088e47
......@@ -17,7 +17,7 @@ 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.MchineDetailBean;
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;
......@@ -156,7 +156,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
private UserDataMachineAdapter data4Adapter;
private MchineDetailBean machineDetailBean;
private MachineDetailBean machineDetailBean;
private List<String> data1List;
private List<String> data2List;
private List<String> data3List;
......@@ -256,15 +256,15 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
toast(data.getMsg());
return;
}
machineDetailBean = JSON.parseObject(data.getData().toString(), MchineDetailBean.class);
MchineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
if (castInfo != null) {
tvMachineType.setText(castInfo.getContinuousCasterName());
tvSection.setText(castInfo.getFractureSurface());
tvSteelType.setText(castInfo.getSteelGrade());
tvSpeed.setText(castInfo.getCastingSpeed());
}
MchineDetailBean.CastLadleBean castLadle = machineDetailBean.getCastLadle();
MachineDetailBean.CastLadleBean castLadle = machineDetailBean.getCastLadle();
if (castLadle != null) {
tvMiddle1.setText(castLadle.getCapacity());
tvMiddle2.setText(castLadle.getLifeSpan());
......@@ -275,14 +275,14 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
tvMiddle7.setText(castLadle.getBakingTemperature());
tvMiddle8.setText(TimeUtils.millis2String(castLadle.getBakingDateTime()));
}
MchineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent != null) {
tvCover1.setText(covAgent.getLadleCoveringAgentName());
tvCover2.setText(covAgent.getAcidAlkaliDegree());
tvCover3.setText(covAgent.getChemicalComposition());
tvCover4.setText(covAgent.getSupplierName());
}
MchineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu != null) {
tvProtection1.setText(mouldFlu.getMouldFluxesName());
tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
......@@ -300,25 +300,25 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
data3List.clear();
data4List.clear();
if (machineDetailBean.getProductList() != null) {
for (MchineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName());
}
data1Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSupplyList() != null) {
for (MchineDetailBean.SupplyListBean productListBean : machineDetailBean.getSupplyList()) {
for (MachineDetailBean.SupplyListBean productListBean : machineDetailBean.getSupplyList()) {
data2List.add(productListBean.getProductsName());
}
data2Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getOtherSupList() != null) {
for (MchineDetailBean.OtherSupListBean productListBean : machineDetailBean.getOtherSupList()) {
for (MachineDetailBean.OtherSupListBean productListBean : machineDetailBean.getOtherSupList()) {
data3List.add(productListBean.getSupplierName());
}
data3Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getOtherLadleList() != null) {
for (MchineDetailBean.OtherLadleListBean productListBean : machineDetailBean.getOtherLadleList()) {
for (MachineDetailBean.OtherLadleListBean productListBean : machineDetailBean.getOtherLadleList()) {
data4List.add(productListBean.getRefractoryName());
}
data4Adapter.notifyDataSetChanged();
......@@ -336,7 +336,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSupplierActivity.class);
startActivity(MesSupplierActivity.class,"data",JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
}
});
data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
......
app/src/main/res/layout/activity_mes_user_data_supplier.xml
浏览文件 @ d3088e47
......@@ -25,6 +25,7 @@
<TextView
android:id="@+id/tv_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -51,6 +52,7 @@
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -77,6 +79,7 @@
<TextView
android:id="@+id/tv_img_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -103,6 +106,7 @@
<TextView
android:id="@+id/tv_send_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......@@ -129,6 +133,7 @@
<TextView
android:id="@+id/tv_send_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论