提交 e5f47cd3 authored 作者: lgd's avatar lgd

1.质量反馈,列表展示

2.//TODO ,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes其他页面,mes质量反馈,编辑任务担当无法修改.
上级 d26ecb24
...@@ -303,5 +303,12 @@ public interface MesApiService { ...@@ -303,5 +303,12 @@ public interface MesApiService {
@POST("/himes/api/msRelationQuery/show/page.json") @POST("/himes/api/msRelationQuery/show/page.json")
Observable<BaseMesBean> searchList(@Query("functionId") String functionId, @Body RequestBody requestBody); Observable<BaseMesBean> searchList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 质量反馈
*
* @return
*/
@POST("/himes/api/feedback/show/page.json")
Observable<BaseMesBean> feedbackList(@Query("functionId") String functionId, @Body RequestBody requestBody);
} }
package com.wd.workoffice.ui.activity.mes.quality; package com.wd.workoffice.ui.activity.mes.quality;
import android.view.View;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.SmartRefreshLayout;
...@@ -7,8 +9,11 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout; ...@@ -7,8 +9,11 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ProPriceBean; import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.bean.mesBean.FeedbackBean;
import com.wd.workoffice.bean.mesBean.TicketBean;
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.adapter.MesQualityAdapter; import com.wd.workoffice.ui.adapter.MesQualityAdapter;
...@@ -39,7 +44,7 @@ public class MesQualityActivity extends WorkToolBarActivity { ...@@ -39,7 +44,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
@BindView(R.id.srl_refresh) @BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh; SmartRefreshLayout srlRefresh;
private Map<String, Object> param; private Map<String, Object> param;
private List<ProPriceBean.RecordsBean> dataList; private List<FeedbackBean.ListBean> dataList;
private MesQualityAdapter dataAdapter; private MesQualityAdapter dataAdapter;
private int page = 1; private int page = 1;
...@@ -56,14 +61,13 @@ public class MesQualityActivity extends WorkToolBarActivity { ...@@ -56,14 +61,13 @@ public class MesQualityActivity extends WorkToolBarActivity {
dataAdapter = new MesQualityAdapter(R.layout.item_mes_quality, dataList); dataAdapter = new MesQualityAdapter(R.layout.item_mes_quality, dataList);
dataAdapter.bindToRecyclerView(rvData); dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData); dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey(); param = WorkUtils.pageMesKey();
param.put("productId", getIntent().getStringExtra("id")); param.put("pageNum", page);
param.put("current", page);
getData(); getData();
} }
private void getData() { private void getData() {
RtfUtils.getRtf().getProHistoryPrice(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { RtfUtils.getMesRtf().feedbackList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -75,14 +79,13 @@ public class MesQualityActivity extends WorkToolBarActivity { ...@@ -75,14 +79,13 @@ public class MesQualityActivity extends WorkToolBarActivity {
} }
@Override @Override
public void onSuccess(BaseBean data) { public void onSuccess(BaseMesBean data) {
hideLoading(); hideLoading();
if (data.getCode() != 0) { if (!data.isSuccess()) {
toast(data.getMessage()); toast(data.getMsg());
return; return;
} }
List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords(); List<FeedbackBean.ListBean> getList = JSON.parseObject(data.getData().toString(), FeedbackBean.class).getList();
if (page == 1) { if (page == 1) {
srlRefresh.finishRefresh(); srlRefresh.finishRefresh();
dataList.clear(); dataList.clear();
...@@ -110,17 +113,23 @@ public class MesQualityActivity extends WorkToolBarActivity { ...@@ -110,17 +113,23 @@ public class MesQualityActivity extends WorkToolBarActivity {
@Override @Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) { public void onRefresh(@NonNull RefreshLayout refreshLayout) {
page = 1; page = 1;
param.put("current", page); param.put("pageNum", page);
getData(); getData();
} }
}); });
dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override @Override
public void onLoadMoreRequested() { public void onLoadMoreRequested() {
param.put("current", page); param.put("pageNum", page);
getData(); getData();
} }
}, rvData); }, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// startActivity();
}
});
} }
@Override @Override
...@@ -128,5 +137,4 @@ public class MesQualityActivity extends WorkToolBarActivity { ...@@ -128,5 +137,4 @@ public class MesQualityActivity extends WorkToolBarActivity {
return R.layout.activity_mes_quality; return R.layout.activity_mes_quality;
} }
} }
...@@ -5,6 +5,8 @@ import android.widget.LinearLayout; ...@@ -5,6 +5,8 @@ import android.widget.LinearLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.mes.quality.MesQualityActivity;
import com.wd.workoffice.ui.activity.mes.search.MesSearchActivity;
import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity; import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity;
import com.wd.workoffice.ui.activity.mes.user.MesUserDataListActivity; import com.wd.workoffice.ui.activity.mes.user.MesUserDataListActivity;
...@@ -58,8 +60,10 @@ public class MesTicketActivity extends WorkToolBarActivity { ...@@ -58,8 +60,10 @@ public class MesTicketActivity extends WorkToolBarActivity {
startActivity(MesUserDataListActivity.class); startActivity(MesUserDataListActivity.class);
break; break;
case R.id.ll_quality: case R.id.ll_quality:
startActivity(MesQualityActivity.class);
break; break;
case R.id.ll_search: case R.id.ll_search:
startActivity(MesSearchActivity.class);
break; break;
} }
} }
......
...@@ -3,7 +3,9 @@ package com.wd.workoffice.ui.adapter; ...@@ -3,7 +3,9 @@ package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProPriceBean; import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.bean.mesBean.FeedbackBean;
import java.util.List; import java.util.List;
...@@ -11,7 +13,7 @@ import java.util.List; ...@@ -11,7 +13,7 @@ import java.util.List;
* Created by flexible on 2018/8/13. * Created by flexible on 2018/8/13.
*/ */
public class MesQualityAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean, BaseViewHolder> { public class MesQualityAdapter extends BaseQuickAdapter<FeedbackBean.ListBean, BaseViewHolder> {
public MesQualityAdapter(int layoutResId, List data) { public MesQualityAdapter(int layoutResId, List data) {
super(layoutResId, data); super(layoutResId, data);
...@@ -19,7 +21,12 @@ public class MesQualityAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean ...@@ -19,7 +21,12 @@ public class MesQualityAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean
@Override @Override
protected void convert(BaseViewHolder helper, ProPriceBean.RecordsBean item) { protected void convert(BaseViewHolder helper, FeedbackBean.ListBean item) {
helper.setText(R.id.tv_no, item.getFeedbackCode());
helper.setText(R.id.tv_manager, item.getId());
helper.setText(R.id.tv_name, item.getCustomerName());
helper.setText(R.id.tv_phone, item.getPhoneNumber());
helper.setText(R.id.tv_pro, item.getProductName());
} }
} }
...@@ -45,6 +45,13 @@ ...@@ -45,6 +45,13 @@
android:gravity="center" android:gravity="center"
android:text="联系电话" android:text="联系电话"
android:textSize="12sp" /> android:textSize="12sp" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="产品"
android:textSize="12sp" />
</LinearLayout> </LinearLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
......
...@@ -7,14 +7,16 @@ ...@@ -7,14 +7,16 @@
<TextView <TextView
android:id="@+id/tv_no"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="客户编码" android:text="反馈单号"
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/tv_name"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
...@@ -23,18 +25,28 @@ ...@@ -23,18 +25,28 @@
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/tv_manager"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="炼钢厂" android:text="销售经理"
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <TextView
android:id="@+id/tv_phone"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="连铸机" android:text="联系电话"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_pro"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="产品"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论