Skip to content

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

1.质量反馈，详情和第一个审核 

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.
上级 e5f47cd3
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 280 行增加 和 59 行删除
app/src/main/java/com/wd/workoffice/bean/event/CheckFeedbackEvent.java 0 → 100644
浏览文件 @ 632fcd08
package com.wd.workoffice.bean.event;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class CheckFeedbackEvent {
public CheckFeedbackEvent() {
}
}
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ 632fcd08
......@@ -245,6 +245,7 @@ public interface MesApiService {
*/
@POST("/himes/api/msSceneFeedback/show/getByFeedInfo.json")
Observable<BaseMesBean> userDataDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* otherSupplierAdd
*
......@@ -311,4 +312,20 @@ public interface MesApiService {
@POST("/himes/api/feedback/show/page.json")
Observable<BaseMesBean> feedbackList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 质量反馈 详情
*
* @return
*/
@GET("/himes/api/feedback/show/{id}.json")
Observable<BaseMesBean> feedbackDetail(@Path("id") String id, @Query("functionId") String functionId);
/**
* 质量反馈 详情
*
* @return
*/
@GET("/himes/api/feedback/deal/update.json")
Observable<BaseMesBean> feedbackCheck( @Query("functionId") String functionId, @Body RequestBody requestBody);
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityActivity.java
浏览文件 @ 632fcd08
package com.wd.workoffice.ui.activity.mes.quality;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
......@@ -8,16 +12,13 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
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.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.WorkObserver;
import com.wd.workoffice.ui.activity.mes.ticket.MesTicketConditionActivity;
import com.wd.workoffice.ui.adapter.MesQualityAdapter;
import com.wd.workoffice.ui.adapter.MesSearchAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -29,6 +30,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
......@@ -43,6 +45,8 @@ public class MesQualityActivity extends WorkToolBarActivity {
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
@BindView(R.id.btn_add)
Button btnAdd;
private Map<String, Object> param;
private List<FeedbackBean.ListBean> dataList;
private MesQualityAdapter dataAdapter;
......@@ -127,7 +131,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// startActivity();
startActivity(MesQualityDetailActivity.class, "id", dataList.get(position).getId() + "");
}
});
}
......@@ -137,4 +141,24 @@ public class MesQualityActivity extends WorkToolBarActivity {
return R.layout.activity_mes_quality;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivityForResult(MesTicketConditionActivity.class, 10001);
break;
}
return super.onOptionsItemSelected(item);
}
@OnClick(R.id.btn_add)
public void onViewClicked() {
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDetailActivity.java
浏览文件 @ 632fcd08
package com.wd.workoffice.ui.activity.mes.quality;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
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.ProPriceBean;
import com.wd.workoffice.ui.adapter.MesQualityAdapter;
import java.util.List;
import java.util.Map;
import com.wd.workoffice.bean.mesBean.FeedbackDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* author : flexible
......@@ -17,63 +28,184 @@ import butterknife.ButterKnife;
**/
public class MesQualityDetailActivity extends WorkToolBarActivity {
private Map<String, Object> param;
private List<ProPriceBean.RecordsBean> dataList;
private MesQualityAdapter dataAdapter;
private int page = 1;
@BindView(R.id.btn_reviews)
Button btnReviews;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.tv_no)
TextView tvNo;
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_manager)
TextView tvManager;
@BindView(R.id.tv_phone)
TextView tvPhone;
@BindView(R.id.tv_code)
TextView tvCode;
@BindView(R.id.tv_pro_name)
TextView tvProName;
@BindView(R.id.tv_spec)
TextView tvSpec;
@BindView(R.id.tv_img_code)
TextView tvImgCode;
@BindView(R.id.tv_box)
TextView tvBox;
@BindView(R.id.tv_num)
TextView tvNum;
@BindView(R.id.tv_mark_code)
TextView tvMarkCode;
@BindView(R.id.tv_machine)
TextView tvMachine;
@BindView(R.id.tv_steel_type)
TextView tvSteelType;
@BindView(R.id.tv_defect)
TextView tvDefect;
@BindView(R.id.tv_defect_reason)
TextView tvDefectReason;
@BindView(R.id.tv_desc)
TextView tvDesc;
@BindView(R.id.tv_use_status)
TextView tvUseStatus;
@BindView(R.id.tv_suggest)
TextView tvSuggest;
@BindView(R.id.rv_img)
RecyclerView rvImg;
@BindView(R.id.ll_manager)
LinearLayout llManager;
@BindView(R.id.tv_factory_reason)
TextView tvFactoryReason;
@BindView(R.id.tv_factory_suggest)
TextView tvFactorySuggest;
@BindView(R.id.tv_factory_status)
TextView tvFactoryStatus;
@BindView(R.id.tv_process)
TextView tvProcess;
@BindView(R.id.tv_duty_person)
TextView tvDutyPerson;
@BindView(R.id.tv_verify_person)
TextView tvVerifyPerson;
@BindView(R.id.tv_question)
TextView tvQuestion;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.ll_company)
LinearLayout llCompany;
@BindView(R.id.tv_client_status)
TextView tvClientStatus;
@BindView(R.id.tv_client_reply)
TextView tvClientReply;
@BindView(R.id.tv_client_record)
TextView tvClientRecord;
@BindView(R.id.tv_client_person)
TextView tvClientPerson;
@BindView(R.id.ll_client)
LinearLayout llClient;
private FeedbackDetailBean detailBean;
@Override
protected void initView() {
ButterKnife.bind(this);
llBottom.setVisibility(View.VISIBLE);
}
@Override
protected void initData() {
// getData();
detail();
}
// private void getData() {
// RtfUtils.getRtf().getProHistoryPrice(param).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.getMsg());
// return;
// }
// List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();
//
// if (page == 1) {
// srlRefresh.finishRefresh();
// dataList.clear();
// dataList.addAll(getList);
// dataAdapter.notifyDataSetChanged();
// dataAdapter.loadMoreComplete();
// } else {
// dataAdapter.loadMoreComplete();
// dataList.addAll(getList);
// dataAdapter.notifyDataSetChanged();
// }
// if (getList.size() == 0) {
// dataAdapter.loadMoreEnd();
// } else {
// page++;
// }
// }
// });
// }
private void detail() {
RtfUtils.getMesRtf().feedbackDetail(getIntent().getStringExtra("id"), "1").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.getMsg());
return;
}
detailBean = JSON.parseObject(data.getData().toString(), FeedbackDetailBean.class);
changeView();
}
});
}
private void changeView() {
switch (detailBean.getStatus()) {
case "0":
llClient.setVisibility(View.GONE);
llCompany.setVisibility(View.GONE);
llManager.setVisibility(View.GONE);
llBottom.setVisibility(View.VISIBLE);
break;
case "1":
llClient.setVisibility(View.GONE);
llCompany.setVisibility(View.GONE);
llManager.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.VISIBLE);
break;
case "2":
llClient.setVisibility(View.VISIBLE);
llCompany.setVisibility(View.GONE);
llManager.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.VISIBLE);
break;
case "3":
llClient.setVisibility(View.VISIBLE);
llCompany.setVisibility(View.VISIBLE);
llManager.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.GONE);
break;
// case "4":
// llClient.setVisibility(View.VISIBLE);
// llCompany.setVisibility(View.VISIBLE);
// llManager.setVisibility(View.VISIBLE);
// llBottom.setVisibility(View.GONE);
// break;
}
tvNo.setText(detailBean.getFeedbackCode());
tvName.setText(detailBean.getCustomerName());
tvManager.setText(detailBean.getSaleUserName());
tvPhone.setText(detailBean.getPhoneNumber());
tvCode.setText(detailBean.getProcedureCode());
tvProName.setText(detailBean.getProductName());
tvSpec.setText(detailBean.getSpecification());
tvImgCode.setText(detailBean.getDrawingNumber());
tvBox.setText(detailBean.getBoxCode());
tvNum.setText(detailBean.getVerson());
tvMarkCode.setText(detailBean.getSerialNumber());
tvMachine.setText(detailBean.getCasterName());
tvSteelType.setText(detailBean.getSteelTypeName());
tvDefect.setText(detailBean.getDefectName());
tvDefectReason.setText(detailBean.getMainCause());
//二、销售经理反馈信息
tvDesc.setText(detailBean.getFeedbackDescription());
tvUseStatus.setText(detailBean.getOtherProviderBehavior());
tvSuggest.setText(detailBean.getSalerOpinion());
//三、公司本部反馈信息
tvFactoryReason.setText(detailBean.getFactoryAnalysis());
tvFactoryStatus.setText(detailBean.getFactoryImplement());
tvFactorySuggest.setText(detailBean.getFactoryLeaderOpinion());
tvProcess.setText(detailBean.getTreatRectPlan());
tvDutyPerson.setText(detailBean.getResponsibleDealName());
tvVerifyPerson.setText(detailBean.getApprovalUserName());
tvQuestion.setText(detailBean.getDefectMudName());
tvTime.setText(detailBean.getFactoryTreatmentDateTime());
//四、客户回馈信息
tvClientStatus.setText(detailBean.getApprovalUserName());
tvClientReply.setText(detailBean.getDefectMudName());
tvClientRecord.setText(detailBean.getFactoryTreatmentDateTime());
tvClientPerson.setText(detailBean.getFactoryTreatmentDateTime());
}
@Override
protected void initEvent() {
......@@ -85,4 +217,19 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
}
@OnClick(R.id.btn_reviews)
public void onViewClicked() {
// switch (detailBean.getStatus()) {
switch ("0") {
case "0":
startActivity(MesQualityManagerActivity.class,"data",JSON.toJSONString(detailBean));
break;
case "1":
startActivity(MesQualityFactoryActivity.class,"data",JSON.toJSONString(detailBean));
break;
case "2":
startActivity(MesQualityClientActivity.class,"data",JSON.toJSONString(detailBean));
break;
}
}
}
app/src/main/res/layout/activity_mes_quality.xml
浏览文件 @ 632fcd08
......@@ -4,11 +4,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -59,5 +62,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white" />
</LinearLayout>
</LinearLayout>
<Button
android:id="@+id/btn_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="20mm"
android:background="@color/blue_btn"
android:text="新建"
android:textColor="@color/white" />
</RelativeLayout>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
\ No newline at end of file
app/src/main/res/layout/activity_mes_quality_manager.xml
浏览文件 @ 632fcd08
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
......@@ -34,6 +34,7 @@
android:textSize="14sp" />
<EditText
android:id="@+id/tv_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
......@@ -55,6 +56,7 @@
android:textSize="14sp" />
<EditText
android:id="@+id/tv_use_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
......@@ -76,6 +78,7 @@
android:textSize="14sp" />
<EditText
android:id="@+id/tv_suggest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
......@@ -97,6 +100,7 @@
android:textSize="15sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_img"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论