提交 4d6b564b authored 作者: lgd's avatar lgd

1.质量追溯列表

2.//TODO 坩埚下单,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级 306bb297
......@@ -2160,6 +2160,14 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.QualityTraceabilityActivity"
android:configChanges="keyboardHidden|orientation"
android:label="质量追溯"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
package com.wd.workoffice.bean.mesBean;
import com.wd.workoffice.app.BaseMesPageBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class QualityTraceabilityBean extends BaseMesPageBean {
private List<ListBean> list;
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public static class ListBean {
/**
* id : 1
* serialNumber : SERIAL0002
* basketId : ASDAS
* basketCode : LONGK0001
* productId : 7101010688L
* productCode : 7101010688L
* productName : 塞棒(高碱)加套B354-2
* drawingNumber : xxxxx
* specification : null
* orderId : cf185b11382311ea8334fa163e1166bd
* orderNumber : SOGK19112800012
* manufactureOrderNumber : LSL1111
* seriesName : null
* siteId : GK10
* siteName : 生产部(GK)
* siteCode : GK10
* verson : null
* boxId : null
* boxNumber : null
* innerBoxCode : null
* outerBoxCode : null
* mpsProductDetailVOS : null
* seriesType : null
* custCode : null
* steelTypeId : null
* steelTypeName : null
*/
private String id;
private String serialNumber;
private String basketId;
private String basketCode;
private String productId;
private String productCode;
private String productName;
private String drawingNumber;
private String specification;
private String orderId;
private String orderNumber;
private String manufactureOrderNumber;
private String seriesName;
private String siteId;
private String siteName;
private String siteCode;
private String verson;
private Object boxId;
private String boxNumber;
private Object innerBoxCode;
private Object outerBoxCode;
private Object mpsProductDetailVOS;
private Object seriesType;
private Object custCode;
private Object steelTypeId;
private Object steelTypeName;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getSerialNumber() {
return serialNumber;
}
public void setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber;
}
public String getBasketId() {
return basketId;
}
public void setBasketId(String basketId) {
this.basketId = basketId;
}
public String getBasketCode() {
return basketCode;
}
public void setBasketCode(String basketCode) {
this.basketCode = basketCode;
}
public String getProductId() {
return productId;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getDrawingNumber() {
return drawingNumber;
}
public void setDrawingNumber(String drawingNumber) {
this.drawingNumber = drawingNumber;
}
public String getSpecification() {
return specification;
}
public void setSpecification(String specification) {
this.specification = specification;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getOrderNumber() {
return orderNumber;
}
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public String getManufactureOrderNumber() {
return manufactureOrderNumber;
}
public void setManufactureOrderNumber(String manufactureOrderNumber) {
this.manufactureOrderNumber = manufactureOrderNumber;
}
public String getSeriesName() {
return seriesName;
}
public void setSeriesName(String seriesName) {
this.seriesName = seriesName;
}
public String getSiteId() {
return siteId;
}
public void setSiteId(String siteId) {
this.siteId = siteId;
}
public String getSiteName() {
return siteName;
}
public void setSiteName(String siteName) {
this.siteName = siteName;
}
public String getSiteCode() {
return siteCode;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
public String getVerson() {
return verson;
}
public void setVerson(String verson) {
this.verson = verson;
}
public Object getBoxId() {
return boxId;
}
public void setBoxId(Object boxId) {
this.boxId = boxId;
}
public String getBoxNumber() {
return boxNumber;
}
public void setBoxNumber(String boxNumber) {
this.boxNumber = boxNumber;
}
public Object getInnerBoxCode() {
return innerBoxCode;
}
public void setInnerBoxCode(Object innerBoxCode) {
this.innerBoxCode = innerBoxCode;
}
public Object getOuterBoxCode() {
return outerBoxCode;
}
public void setOuterBoxCode(Object outerBoxCode) {
this.outerBoxCode = outerBoxCode;
}
public Object getMpsProductDetailVOS() {
return mpsProductDetailVOS;
}
public void setMpsProductDetailVOS(Object mpsProductDetailVOS) {
this.mpsProductDetailVOS = mpsProductDetailVOS;
}
public Object getSeriesType() {
return seriesType;
}
public void setSeriesType(Object seriesType) {
this.seriesType = seriesType;
}
public Object getCustCode() {
return custCode;
}
public void setCustCode(Object custCode) {
this.custCode = custCode;
}
public Object getSteelTypeId() {
return steelTypeId;
}
public void setSteelTypeId(Object steelTypeId) {
this.steelTypeId = steelTypeId;
}
public Object getSteelTypeName() {
return steelTypeName;
}
public void setSteelTypeName(Object steelTypeName) {
this.steelTypeName = steelTypeName;
}
}
}
......@@ -54,6 +54,7 @@ public class QualityTraceabilityActivity extends WorkBaseActivity {
private Map<String, Object> param;
private List<QualityTraceabilityBean.ListBean> dataList;
private QualityTraceabilityAdapter dataAdapter;
private Map<String, Object> paramMap;
@Override
protected void initView() {
......@@ -72,7 +73,8 @@ public class QualityTraceabilityActivity extends WorkBaseActivity {
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageMesKey();
param.put("pageNum", 1);
param.put("length", 100);
paramMap = WorkUtils.simpleParam();
param.put("paramMap", paramMap);
getData();
}
......@@ -130,11 +132,11 @@ public class QualityTraceabilityActivity extends WorkBaseActivity {
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
param.put("pageNum", page);
getData();
});
dataAdapter.setOnLoadMoreListener(() -> {
param.put("current", page);
param.put("pageNum", page);
getData();
}, rvData);
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
......@@ -166,8 +168,8 @@ public class QualityTraceabilityActivity extends WorkBaseActivity {
@OnClick(R.id.tv_search)
public void onViewClicked() {
page = 1;
param.put("current", page);
param.put("searchValue", etKey.getText().toString());
param.put("pageNum", page);
paramMap.put("serialNumber", etKey.getText().toString());
getData();
}
......
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.WarehouseStockBean;
import com.wd.workoffice.bean.mesBean.QualityTraceabilityBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class QualityTraceabilityAdapter extends BaseQuickAdapter<QualityTraceabilityBean.ListBean, BaseViewHolder> {
public QualityTraceabilityAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, QualityTraceabilityBean.ListBean item) {
helper.setText(R.id.tv_no, String.format("订单号:%s", item.getOrderNumber()));
helper.setText(R.id.tv_single_code, item.getSerialNumber());
helper.setText(R.id.tv_pro_name, item.getProductName());
helper.setText(R.id.tv_pro_code, item.getProductCode());
helper.setText(R.id.tv_img_code, item.getDrawingNumber());
helper.setText(R.id.tv_spec, item.getSpecification());
helper.setText(R.id.tv_box_num, item.getBoxNumber());
helper.setText(R.id.tv_factory_name, item.getSiteName());
helper.setText(R.id.tv_factory_code, item.getSiteCode());
helper.setText(R.id.tv_code, item.getManufactureOrderNumber());
helper.setText(R.id.tv_version, item.getVerson());
helper.setText(R.id.tv_pro, item.getSeriesName());
}
}
......@@ -10,6 +10,7 @@ import com.wd.workoffice.bean.vo.BatLayoutVo;
import com.wd.workoffice.ui.activity.mes.MesFeedbackActivity;
import com.wd.workoffice.ui.activity.mes.MesScrappedActivity;
import com.wd.workoffice.ui.activity.mes.MesServiceActivity;
import com.wd.workoffice.ui.activity.mes.QualityTraceabilityActivity;
import com.wd.workoffice.ui.activity.mes.analysis.MesAnalysisActivity;
import com.wd.workoffice.ui.activity.mes.order.MesOrderActivity;
import com.wd.workoffice.ui.activity.mes.MesProcessActivity;
......@@ -115,6 +116,7 @@ public class MesFragment extends WorkBaseFg {
case 3:
break;
case 4:
startActivity(QualityTraceabilityActivity.class);
break;
case 5:
// startActivity(MesFeedbackActivity.class);
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tb_title"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Light"
app:contentInsetEnd="0mm"
app:contentInsetEndWithActions="0mm"
app:contentInsetLeft="0mm"
app:contentInsetRight="0mm"
app:contentInsetStart="0mm"
app:contentInsetStartWithNavigation="0mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingVertical="5mm">
<EditText
android:id="@+id/et_key"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginVertical="3mm"
android:layout_weight="1"
android:background="@drawable/shape_client_search"
android:hint="输入产品标识码"
android:paddingHorizontal="3mm"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:paddingHorizontal="8mm"
android:text="搜索" />
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
<View style="@style/dividerX" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
\ No newline at end of file
<?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_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="20mm">
<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_single_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_pro_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_pro_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_img_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_spec"
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_box_num"
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>
<!-- 4.下单时间 -->
<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_factory_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_factory_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"
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_version"
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_pro"
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 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论