1.用户反馈炼钢厂

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改

app/src/main/java/com/wd/workoffice/bean/mesBean/FactoryBean.java

+package com.wd.workoffice.bean.mesBean;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class FactoryBean {
+
+    /**
+     * id : 17
+     * createDateTime : 1585721646000
+     * updateDateTime : 1587459925000
+     * steelmakingWorksCode : lgc1
+     * steelmakingWorksName : Liangan7
+     * annualOutput : 1111777
+     * steelGrade : 88888777
+     * createUserId : 398c852b38e911ea8334fa163e1166bd
+     * createUserName : null
+     * updateUserId : 398c852b38e911ea8334fa163e1166bd
+     * updateUserName : hello
+     * remark : null
+     * customerUserCode : KN00185
+     * delete : false
+     */
+
+    private String id;
+    private long createDateTime;
+    private long updateDateTime;
+    private String steelmakingWorksCode;
+    private String steelmakingWorksName;
+    private String annualOutput;
+    private String steelGrade;
+    private String createUserId;
+    private Object createUserName;
+    private String updateUserId;
+    private String updateUserName;
+    private Object remark;
+    private String customerUserCode;
+    private boolean delete;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public long getCreateDateTime() {
+        return createDateTime;
+    }
+
+    public void setCreateDateTime(long createDateTime) {
+        this.createDateTime = createDateTime;
+    }
+
+    public long getUpdateDateTime() {
+        return updateDateTime;
+    }
+
+    public void setUpdateDateTime(long updateDateTime) {
+        this.updateDateTime = updateDateTime;
+    }
+
+    public String getSteelmakingWorksCode() {
+        return steelmakingWorksCode;
+    }
+
+    public void setSteelmakingWorksCode(String steelmakingWorksCode) {
+        this.steelmakingWorksCode = steelmakingWorksCode;
+    }
+
+    public String getSteelmakingWorksName() {
+        return steelmakingWorksName;
+    }
+
+    public void setSteelmakingWorksName(String steelmakingWorksName) {
+        this.steelmakingWorksName = steelmakingWorksName;
+    }
+
+    public String getAnnualOutput() {
+        return annualOutput;
+    }
+
+    public void setAnnualOutput(String annualOutput) {
+        this.annualOutput = annualOutput;
+    }
+
+    public String getSteelGrade() {
+        return steelGrade;
+    }
+
+    public void setSteelGrade(String steelGrade) {
+        this.steelGrade = steelGrade;
+    }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    public Object getCreateUserName() {
+        return createUserName;
+    }
+
+    public void setCreateUserName(Object createUserName) {
+        this.createUserName = createUserName;
+    }
+
+    public String getUpdateUserId() {
+        return updateUserId;
+    }
+
+    public void setUpdateUserId(String updateUserId) {
+        this.updateUserId = updateUserId;
+    }
+
+    public String getUpdateUserName() {
+        return updateUserName;
+    }
+
+    public void setUpdateUserName(String updateUserName) {
+        this.updateUserName = updateUserName;
+    }
+
+    public Object getRemark() {
+        return remark;
+    }
+
+    public void setRemark(Object remark) {
+        this.remark = remark;
+    }
+
+    public String getCustomerUserCode() {
+        return customerUserCode;
+    }
+
+    public void setCustomerUserCode(String customerUserCode) {
+        this.customerUserCode = customerUserCode;
+    }
+
+    public boolean isDelete() {
+        return delete;
+    }
+
+    public void setDelete(boolean delete) {
+        this.delete = delete;
+    }
+}

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

@@ -148,6 +148,7 @@ public interface MesApiService {
     @Multipart
     @POST("/himes/api/file/uploadFile")
     Observable<BaseMesBean> upload(@Part MultipartBody.Part file);
+
     /**
      * 产品
      *
@@ -155,4 +156,12 @@ public interface MesApiService {
      */
     @POST("/himes/api/msSceneFeedback/show/page.json")
     Observable<BaseMesBean> userDataList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+    /**
+     * 炼钢厂列表查询
+     *
+     * @return
+     */
+    @POST("/himes/api/msSteelmakingWorks/show/list.json")
+    Observable<BaseMesBean> factoryList(@Query("functionId") String functionId, @Query("customerUserCode") String customerUserCode, @Body RequestBody requestBody);
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseClientActivity.java

@@ -14,6 +14,7 @@ import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.ClientBean;
 import com.wd.workoffice.bean.mesBean.MesClientBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
@@ -121,11 +122,15 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
         clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                Intent intent = new Intent();
-//                intent.putExtra("clientName", clientList.get(position).getName());
-//                intent.putExtra("id", clientList.get(position).getId());
-                setResult(10001, intent);
-                finish();
+                UserDataBean.ListBean userDataBean = new UserDataBean.ListBean();
+                MesClientBean.ListBean chooseClient = clientList.get(position);
+                userDataBean.setCustomerUserCode(chooseClient.getCustomerCode());
+                userDataBean.setCustomerUserName(chooseClient.getCustomerName());
+                userDataBean.setSalesCompanyCode(chooseClient.getSalesCompanyCode());
+                userDataBean.setSalesCompanyName(chooseClient.getSalesCompanyName());
+                userDataBean.setSalesManagerCode(chooseClient.getSalesManagerCode());
+                userDataBean.setSalesManagerName(chooseClient.getSalesManagerName());
+                startActivity(MesUserDataAdd2Activity.class, "data", JSON.toJSONString(userDataBean));
             }
         });
     }
@@ -138,7 +143,7 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
 
     @OnClick(R.id.btn_search)
     public void onViewClicked() {
-        param.put("name", etKey.getText().toString());
+        param.put("customerName", etKey.getText().toString());
         param.put("pageNum", 1);
         page = 1;
         getData();

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.java

@@ -12,13 +12,18 @@ import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 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.ClientBean;
 import com.wd.workoffice.bean.event.AddDepEvent;
 import com.wd.workoffice.bean.event.AddFactoryEvent;
+import com.wd.workoffice.bean.mesBean.FactoryBean;
+import com.wd.workoffice.bean.mesBean.MesClientBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
+import com.wd.workoffice.ui.adapter.UserDataFactorytAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -51,37 +56,31 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
     @BindView(R.id.rv_client)
     RecyclerView rvClient;
     private Map<String, Object> param;
-    private List<ClientBean.RecordsBean> clientList;
-    private UserDataClientAdapter clientAdapter;
-    private int page = 1;
+    private List<FactoryBean> clientList;
+    private UserDataFactorytAdapter clientAdapter;
+    private UserDataBean.ListBean data;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
         rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        etKey.setHint("请输入炼钢厂");
     }
 
+
     @Override
     protected void initData() {
+        data = JSON.parseObject(getIntent().getStringExtra("data"), UserDataBean.ListBean.class);
         clientList = new ArrayList<>();
-        clientList.add(null);
-        clientList.add(null);
-        clientList.add(null);
-        clientAdapter = new UserDataClientAdapter(R.layout.item_store_client, clientList);
+        clientAdapter = new UserDataFactorytAdapter(R.layout.item_store_client, clientList);
         clientAdapter.bindToRecyclerView(rvClient);
         clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
         param = WorkUtils.pageKey();
-//        getData();
+        getData();
     }
 
     private void getData() {
-        Observable<BaseBean> observable;
-        if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-            observable = RtfUtils.getRtf().getClient(param);
-        } else {
-            observable = RtfUtils.getRtf().getClientOut(param);
-        }
-        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getMesRtf().factoryList("1", data.getCustomerUserCode(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -93,55 +92,24 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
             }
 
             @Override
-            public void onSuccess(BaseBean data) {
+            public void onSuccess(BaseMesBean data) {
                 hideLoading();
-                if (data.getCode() != 0) {
-                    toast(data.getMessage());
+                if (!data.isSuccess()) {
+                    toast(data.getMsg());
                     return;
                 }
-                List<ClientBean.RecordsBean> dataList = new ArrayList<>();
-                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-                    ClientBean clientBean = JSON.parseObject(data.getData().toString(), ClientBean.class);
-                    dataList.addAll(clientBean.getRecords());
-                    if (page == 1) {
-                        clientList.clear();
-                        clientList.addAll(dataList);
-                        clientAdapter.notifyDataSetChanged();
-                        clientAdapter.loadMoreComplete();
-                    } else {
-                        clientAdapter.loadMoreComplete();
-                        clientList.addAll(dataList);
-                        clientAdapter.notifyDataSetChanged();
-                    }
-                    if (dataList.size() == 0) {
-                        clientAdapter.loadMoreEnd();
-                    } else {
-                        page++;
-                    }
-                } else {
-                    dataList.addAll(JSON.parseArray(data.getData().toString(), ClientBean.RecordsBean.class));
-                    clientAdapter.loadMoreEnd();
+                List<FactoryBean> getList = JSON.parseArray(data.getData().toString(), FactoryBean.class);
                 clientList.clear();
-                    clientList.addAll(dataList);
+                clientList.addAll(getList);
                 clientAdapter.notifyDataSetChanged();
-                }
-                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-
-                }
                 toast("搜索成功");
             }
         });
     }
 
+
     @Override
     protected void initEvent() {
-        clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
-            @Override
-            public void onLoadMoreRequested() {
-                param.put("current", page);
-//                getData();
-            }
-        }, rvClient);
         clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
@@ -162,10 +130,9 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
 
     @OnClick(R.id.btn_search)
     public void onViewClicked() {
-        param.put("name", etKey.getText().toString());
+        param.put("steelmakingWorksName", etKey.getText().toString());
         param.put("current", 1);
-        page = 1;
-//        getData();
+        getData();
     }
 
     @Override

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd2Activity.java

@@ -12,6 +12,7 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 
@@ -37,7 +38,12 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity {
     TextView tvFactory;
     @BindView(R.id.rl_factory)
     RelativeLayout rlFactory;
+    @BindView(R.id.tv_company)
+    TextView tvCompany;
+    @BindView(R.id.tv_manager)
+    TextView tvManager;
     private AccountBean dataBean;
+    private UserDataBean.ListBean data;
 
     @Override
     protected void initView() {
@@ -46,7 +52,11 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
-        getData();
+        data = JSON.parseObject(getIntent().getStringExtra("data"), UserDataBean.ListBean.class);
+        tvClient.setText(data.getCustomerUserName());
+        tvCompany.setText(data.getSalesCompanyName());
+        tvManager.setText(data.getSalesManagerName());
+//        getData();
     }
 
     private void getData() {
@@ -118,6 +128,8 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity {
 
     @OnClick(R.id.rl_factory)
     public void onViewClicked() {
-        startActivityForResult(MesChooseFactoryActivity.class, 10001);
+//        startActivityForResult(MesChooseFactoryActivity.class, 10001);
+        startActivity(MesChooseFactoryActivity.class, "data", JSON.toJSONString(data));
     }
+
 }

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

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

@@ -27,7 +27,6 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_marginRight="3mm"
-            android:text="请选择"
             android:textSize="14sp" />
 
     </RelativeLayout>
@@ -50,11 +49,11 @@
 
 
         <TextView
+            android:id="@+id/tv_company"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_marginRight="3mm"
-            android:text="请选择"
             android:textSize="14sp" />
 
     </RelativeLayout>
@@ -77,11 +76,11 @@
 
 
         <TextView
+            android:id="@+id/tv_manager"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_marginRight="3mm"
-            android:text="请选择"
             android:textSize="14sp" />
     </RelativeLayout>