1.修改质量反馈差异

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.支数参数，新建反馈-客户接口

app/src/main/AndroidManifest.xml

@@ -1747,12 +1747,19 @@
         <activity
             android:name=".ui.activity.mes.quality.MesChooseProcessActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label=" "
+            android:label="选择责任工序"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.quality.MesQualityChooseClientActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="选择客户"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name=".ui.activity.mes.user.MesSupplierAddActivity"
             android:configChanges="keyboardHidden|orientation"

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -378,6 +378,13 @@ public interface MesApiService {
      */
     @POST("/himes/api/defectdict/show/page.json")
     Observable<BaseMesBean> defectList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+    /**
+     * 客户
+     *
+     * @return
+     */
+    @POST("/himes/api/customer/show/page.json")
+    Observable<BaseMesBean> qualityClientList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
      * @return

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAddActivity.java

@@ -218,6 +218,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
     }
 
     private void submit() {
+        param.put("status","1");
         RtfUtils.getMesRtf().feedbackAdd("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityChooseClientActivity.java

+package com.wd.workoffice.ui.activity.mes.quality;
+
+import android.content.Intent;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.alibaba.fastjson.JSON;
+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.mesBean.MesClientBean;
+import com.wd.workoffice.bean.mesBean.QualityClientBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.MesClientAdapter;
+import com.wd.workoffice.ui.adapter.MesQualityClientAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+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;
+
+/**
+ * 选择客户
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesQualityChooseClientActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.btn_search)
+    Button btnSearch;
+    @BindView(R.id.rv_client)
+    RecyclerView rvClient;
+    private Map<String, Object> param;
+    private List<QualityClientBean.ListBean> clientList;
+    private MesQualityClientAdapter clientAdapter;
+    private int page = 1;
+    private Map<String, Object> paramMap;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+
+    }
+
+    @Override
+    protected void initData() {
+        clientList = new ArrayList<>();
+        clientAdapter = new MesQualityClientAdapter(R.layout.item_store_client, clientList);
+        clientAdapter.bindToRecyclerView(rvClient);
+        clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
+        paramMap = WorkUtils.simpleParam();
+        param = WorkUtils.pageMesKey();
+        param.put("pageNum", 1);
+        param.put("paramMap",paramMap);
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().qualityClientList("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<QualityClientBean.ListBean> getList = JSON.parseObject(data.getData().toString(), QualityClientBean.class).getList();
+                if (page == 1) {
+                    clientList.clear();
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                    clientAdapter.loadMoreComplete();
+                } else {
+                    clientAdapter.loadMoreComplete();
+                    clientList.addAll(getList);
+                    clientAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    clientAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+                toast("搜索成功");
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("pageNum", page);
+                getData();
+            }
+        }, rvClient);
+        clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                Intent intent = new Intent();
+                intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
+                setResult(10001, intent);
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_take_on;
+    }
+
+
+    @OnClick(R.id.btn_search)
+    public void onViewClicked() {
+        paramMap.put("customerName", etKey.getText().toString());
+        param.put("pageNum", 1);
+        page = 1;
+        getData();
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityClientActivity.java

@@ -59,7 +59,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
         param = WorkUtils.simpleParam();
         FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
         param.put("id",data.getId());
-        param.put("status",3);
+        param.put("status",4);
     }
 
     private void submit() {

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDetailActivity.java

@@ -167,27 +167,27 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
             case "1":
                 llClient.setVisibility(View.GONE);
                 llCompany.setVisibility(View.GONE);
-                llManager.setVisibility(View.VISIBLE);
+                llManager.setVisibility(View.GONE);
                 llBottom.setVisibility(View.VISIBLE);
                 break;
             case "2":
                 llClient.setVisibility(View.GONE);
-                llCompany.setVisibility(View.VISIBLE);
+                llCompany.setVisibility(View.GONE);
                 llManager.setVisibility(View.VISIBLE);
                 llBottom.setVisibility(View.VISIBLE);
                 break;
             case "3":
+                llClient.setVisibility(View.GONE);
+                llCompany.setVisibility(View.VISIBLE);
+                llManager.setVisibility(View.VISIBLE);
+                llBottom.setVisibility(View.VISIBLE);
+                break;
+            case "4":
                 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());
@@ -241,9 +241,12 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
                 startActivity(MesQualityManagerActivity.class,"data",JSON.toJSONString(detailBean));
                 break;
             case "1":
-                startActivity(MesQualityFactoryActivity.class,"data",JSON.toJSONString(detailBean));
+                startActivity(MesQualityManagerActivity.class,"data",JSON.toJSONString(detailBean));
                 break;
             case "2":
+                startActivity(MesQualityFactoryActivity.class,"data",JSON.toJSONString(detailBean));
+                break;
+            case "3":
                 startActivity(MesQualityClientActivity.class,"data",JSON.toJSONString(detailBean));
                 break;
         }

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityFactoryActivity.java

@@ -85,7 +85,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
         param = WorkUtils.simpleParam();
         data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
         param.put("id", data.getId());
-        param.put("status",2);
+        param.put("status",3);
     }
 
     private void submit() {
@@ -97,8 +97,6 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
         param.put("factoryAnalysis",tvFactoryReason.getText().toString());
         param.put("factoryImplement",tvFactoryStatus.getText().toString());
         param.put("factoryLeaderOpinion",tvFactorySuggest.getText().toString());
-
-
         RtfUtils.getMesRtf().feedbackCheck("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
@@ -153,7 +151,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.rl_process:
-                startActivityForResult(MesChooseProcessActivity.class,10003,"id", data.getProductId());
+                startActivityForResult(MesChooseProcessActivity.class,10003,"id", data.getProductCode());
                 break;
             case R.id.rl_duty_person:
                 startActivityForResult(MesChooseMangerActivity.class,10001);
@@ -162,7 +160,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
                 startActivityForResult(MesChooseMangerActivity.class,10002);
                 break;
             case R.id.rl_question:
-                startActivityForResult(MesChooseQuestionActivity.class,10004,"id", data.getProductId());
+                startActivityForResult(MesChooseQuestionActivity.class,10004,"id", data.getProductCode());
                 break;
             case R.id.rl_time:
                 PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityManagerActivity.java

@@ -77,7 +77,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
         param = WorkUtils.simpleParam();
         FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
         param.put("id",data.getId());
-        param.put("status",1);
+        param.put("status",2);
         imgList=new ArrayList<>();
         ImageBean imageBean = new ImageBean();
         imageBean.setUri(null);

app/src/main/java/com/wd/workoffice/ui/adapter/MesQualityClientAdapter.java

+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.MesClientBean;
+import com.wd.workoffice.bean.mesBean.QualityClientBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class MesQualityClientAdapter extends BaseQuickAdapter<QualityClientBean.ListBean, BaseViewHolder> {
+    public MesQualityClientAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, QualityClientBean.ListBean item) {
+        helper.setText(R.id.tv_name, item.getCustomerName());
+    }
+}
+

app/src/main/res/layout/activity_mes_quality_detail.xml

@@ -489,7 +489,6 @@
                     android:layout_marginBottom="30mm"
                     android:background="@drawable/shape_input_white"
                     android:gravity="top"
-                    android:hint="请输入"
                     android:minLines="4"
                     android:padding="5mm"
                     android:textSize="14sp" />
@@ -697,6 +696,7 @@
                 <View style="@style/dividerX" />
 
                 <RelativeLayout
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="20mm"
@@ -723,6 +723,7 @@
                 <View style="@style/dividerX" />
 
                 <RelativeLayout
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="20mm"

app/src/main/res/layout/activity_mes_quality_factory.xml

@@ -247,6 +247,7 @@
         </RelativeLayout>
 
         <RelativeLayout
+            android:visibility="gone"
             android:id="@+id/rl_time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"