Skip to content

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

1.泥料 

2.TODO 点维修详情测试+单独菜单
上级 db657130
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 372 行增加 和 7 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/MudBean.java 0 → 100644
浏览文件 @ a5f55087
package com.wd.workoffice.bean.mesBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MudBean {
/**
* id : null
* createDateTime : 1596705991000
* updateDateTime : null
* mudId : null
* mudCode : 30601010003
* mudName : T214泥料
* mudVoucherNumber : NLHLGTNULL2006000601
* productId : null
* volatileMatter : 2.0
* orderId : null
* delete : null
*/
private Object id;
private long createDateTime;
private Object updateDateTime;
private Object mudId;
private String mudCode;
private String mudName;
private String mudVoucherNumber;
private Object productId;
private double volatileMatter;
private Object orderId;
private Object delete;
public Object getId() {
return id;
}
public void setId(Object id) {
this.id = id;
}
public long getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(long createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(Object updateDateTime) {
this.updateDateTime = updateDateTime;
}
public Object getMudId() {
return mudId;
}
public void setMudId(Object mudId) {
this.mudId = mudId;
}
public String getMudCode() {
return mudCode;
}
public void setMudCode(String mudCode) {
this.mudCode = mudCode;
}
public String getMudName() {
return mudName;
}
public void setMudName(String mudName) {
this.mudName = mudName;
}
public String getMudVoucherNumber() {
return mudVoucherNumber;
}
public void setMudVoucherNumber(String mudVoucherNumber) {
this.mudVoucherNumber = mudVoucherNumber;
}
public Object getProductId() {
return productId;
}
public void setProductId(Object productId) {
this.productId = productId;
}
public double getVolatileMatter() {
return volatileMatter;
}
public void setVolatileMatter(double volatileMatter) {
this.volatileMatter = volatileMatter;
}
public Object getOrderId() {
return orderId;
}
public void setOrderId(Object orderId) {
this.orderId = orderId;
}
public Object getDelete() {
return delete;
}
public void setDelete(Object delete) {
this.delete = delete;
}
}
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ a5f55087
...@@ -670,12 +670,22 @@ public interface MesApiService { ...@@ -670,12 +670,22 @@ public interface MesApiService {
/** /**
* 用户信息采集历史详情 * 工艺路线
* *
* @return * @return
*/ */
@POST("/himes/api/quality/show/productBy/dispatchDetail.json") @POST("/himes/api/quality/show/productBy/dispatchDetail.json")
Observable<BaseMesBean> dispatchDetail(@Query("functionId") String functionId, @Body RequestBody requestBody); Observable<BaseMesBean> dispatchDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 泥料
*
* @return
*/
@POST("/himes/api/quality/show/productBy/productMud.json")
Observable<BaseMesBean> productMudDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
/** /**
* @return * @return
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/QualityTraceabilityActivity.java
浏览文件 @ a5f55087
...@@ -34,6 +34,7 @@ import flexible.xd.android_base.network.rtfhttp.Transformer; ...@@ -34,6 +34,7 @@ import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
/** /**
* 质量追溯
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/QualityTraceabilityDetailActivity.java
浏览文件 @ a5f55087
package com.wd.workoffice.ui.activity.mes; package com.wd.workoffice.ui.activity.mes;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.DispatchBean; import com.wd.workoffice.bean.mesBean.DispatchBean;
import com.wd.workoffice.bean.mesBean.MudBean;
import com.wd.workoffice.bean.mesBean.QualityTraceabilityBean; import com.wd.workoffice.bean.mesBean.QualityTraceabilityBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseStockNumActivity; import com.wd.workoffice.ui.adapter.MudAdapter;
import com.wd.workoffice.ui.adapter.QualityDispatchAdapter; import com.wd.workoffice.ui.adapter.QualityDispatchAdapter;
import com.wd.workoffice.ui.adapter.QualityTraceabilityAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -70,6 +67,8 @@ public class QualityTraceabilityDetailActivity extends WorkToolBarActivity { ...@@ -70,6 +67,8 @@ public class QualityTraceabilityDetailActivity extends WorkToolBarActivity {
private List<DispatchBean> dispatchList; private List<DispatchBean> dispatchList;
private QualityDispatchAdapter dispatchAdapter; private QualityDispatchAdapter dispatchAdapter;
private QualityTraceabilityBean.ListBean info; private QualityTraceabilityBean.ListBean info;
private List<MudBean> mudList;
private MudAdapter mudAdapter;
@Override @Override
protected void initView() { protected void initView() {
...@@ -91,11 +90,14 @@ public class QualityTraceabilityDetailActivity extends WorkToolBarActivity { ...@@ -91,11 +90,14 @@ public class QualityTraceabilityDetailActivity extends WorkToolBarActivity {
tvBoxNum.setText(info.getBoxNumber()); tvBoxNum.setText(info.getBoxNumber());
tvFactoryName.setText(info.getSiteName()); tvFactoryName.setText(info.getSiteName());
tvFactoryCode.setText(info.getSiteCode()); tvFactoryCode.setText(info.getSiteCode());
tvCode.setText(info.getManufactureOrderNumber()); tvCode.setText(info.getManufactureOrderNumber());
tvVersion.setText(info.getVerson()); tvVersion.setText(info.getVerson());
tvPro.setText(info.getSeriesName()); tvPro.setText(info.getSeriesName());
mudList = new ArrayList<>();
mudAdapter = new MudAdapter(R.layout.item_quality_traceability_mud, mudList);
mudAdapter.bindToRecyclerView(rvMud);
dispatchList = new ArrayList<>(); dispatchList = new ArrayList<>();
dispatchAdapter = new QualityDispatchAdapter(R.layout.item_quality_traceability_dispatch, dispatchList); dispatchAdapter = new QualityDispatchAdapter(R.layout.item_quality_traceability_dispatch, dispatchList);
dispatchAdapter.bindToRecyclerView(rvDispatch); dispatchAdapter.bindToRecyclerView(rvDispatch);
...@@ -131,6 +133,31 @@ public class QualityTraceabilityDetailActivity extends WorkToolBarActivity { ...@@ -131,6 +133,31 @@ public class QualityTraceabilityDetailActivity extends WorkToolBarActivity {
dispatchAdapter.notifyDataSetChanged(); dispatchAdapter.notifyDataSetChanged();
} }
}); });
RtfUtils.getMesRtf().productMudDetail("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<MudBean> getList = JSON.parseArray(data.getData().toString(), MudBean.class);
mudList.clear();
mudList.addAll(getList);
mudAdapter.notifyDataSetChanged();
}
});
} }
@Override @Override
......
app/src/main/java/com/wd/workoffice/ui/adapter/MudAdapter.java 0 → 100644
浏览文件 @ a5f55087
package com.wd.workoffice.ui.adapter;
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.DispatchBean;
import com.wd.workoffice.bean.mesBean.MudBean;
import com.wd.workoffice.util.MathUtils;
import java.util.List;
import flexible.xd.android_base.utils.TimeUtils;
/**
* Created by flexible on 2018/8/13.
*/
public class MudAdapter extends BaseQuickAdapter<MudBean, BaseViewHolder> {
public MudAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, MudBean item) {
// helper.setText(R.id.tv_no,String.format( "泥料编码:%s",item.getProcedureName()));
helper.setText(R.id.tv_name, item.getMudName());
helper.setText(R.id.tv_code, item.getMudCode());
helper.setText(R.id.tv_code_no, item.getMudVoucherNumber());
helper.setText(R.id.tv_data, TimeUtils.millis2String(item.getCreateDateTime()));
helper.setText(R.id.tv_volatilize, MathUtils.converData( item.getVolatileMatter(),3));
}
}
app/src/main/res/layout/item_quality_traceability_mud.xml 0 → 100644
浏览文件 @ a5f55087
<?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:layout_centerHorizontal="true"
android:layout_margin="8mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5mm">
<TextView
android:id="@+id/tv_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="泥料编码:"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="#0841F0"
android:textSize="14sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="泥料名称"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="泥料编码"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="泥料传票号"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_code_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="生产日期"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="挥发份"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_volatilize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论