1.关联查询

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

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

@@ -295,5 +295,13 @@ public interface MesApiService {
     @POST("/himes/api/msSteelmakingWorks/save.json")
     Observable<BaseMesBean> factoryAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
+    /**
+     * 炼钢厂保存、更新
+     *
+     * @return
+     */
+    @POST("/himes/api/msRelationQuery/show/page.json")
+    Observable<BaseMesBean> searchList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
 
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/search/MesSearchActivity.java

 package com.wd.workoffice.ui.activity.mes.search;
 
+import android.content.Intent;
+import android.view.Menu;
+import android.view.MenuItem;
+
 import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 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.SearchBean;
 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.MesSearchAdapter;
-import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
@@ -39,7 +45,7 @@ public class MesSearchActivity extends WorkToolBarActivity {
     @BindView(R.id.srl_refresh)
     SmartRefreshLayout srlRefresh;
     private Map<String, Object> param;
-    private List<ProPriceBean.RecordsBean> dataList;
+    private List<SearchBean.ListBean> dataList;
     private MesSearchAdapter dataAdapter;
     private int page = 1;
 
@@ -63,7 +69,7 @@ public class MesSearchActivity extends WorkToolBarActivity {
     }
 
     private void getData() {
-        RtfUtils.getRtf().getProHistoryPrice(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getMesRtf().searchList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -75,14 +81,13 @@ public class MesSearchActivity 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<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();
-
+                List<SearchBean.ListBean> getList = JSON.parseObject(data.getData().toString(), SearchBean.class).getList();
                 if (page == 1) {
                     srlRefresh.finishRefresh();
                     dataList.clear();
@@ -100,8 +105,7 @@ public class MesSearchActivity extends WorkToolBarActivity {
                     page++;
                 }
             }
-        });
-    }
+        }); }
 
 
     @Override
@@ -128,5 +132,33 @@ public class MesSearchActivity extends WorkToolBarActivity {
         return R.layout.activity_mes_search;
     }
 
+    @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(MesSearchConditionActivity.class, 10001);
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 10001 && resultCode == 10001) {
+            String returnParam = data.getStringExtra("param");
+            param.put("paramMap", JSON.parseObject(returnParam,Map.class));
+            page = 1;
+            param.put("pageNum", page);
+            getData();
+        }
+    }
+
 
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/search/MesSearchConditionActivity.java

 package com.wd.workoffice.ui.activity.mes.search;
 
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.EditText;
+
 import com.alibaba.fastjson.JSON;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-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.WorkToolBarActivity;
-import com.wd.workoffice.bean.ProPriceBean;
-import com.wd.workoffice.retrofit.RtfUtils;
-import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.MesSearchAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
+import androidx.core.widget.NestedScrollView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import flexible.xd.android_base.network.rtfhttp.Transformer;
-import io.reactivex.disposables.Disposable;
 
 /**
  * author : flexible
@@ -32,58 +24,38 @@ import io.reactivex.disposables.Disposable;
  * github: https://github.com/FlexibleXd
  **/
 public class MesSearchConditionActivity extends WorkToolBarActivity {
-
-
+    @BindView(R.id.et_type)
+    EditText etType;
+    @BindView(R.id.et_name)
+    EditText etName;
+    @BindView(R.id.et_img_code)
+    EditText etImgCode;
+    @BindView(R.id.et_spec)
+    EditText etSpec;
+    @BindView(R.id.et_series)
+    EditText etSeries;
+    @BindView(R.id.et_weight)
+    EditText etWeight;
+    @BindView(R.id.et_client)
+    EditText etClient;
+    @BindView(R.id.et_years)
+    EditText etYears;
+    @BindView(R.id.et_drawing)
+    EditText etDrawing;
+    @BindView(R.id.et_section)
+    EditText etSection;
+    @BindView(R.id.et_steel)
+    EditText etSteel;
+    private Map<String, Object> param;
     @Override
     protected void initView() {
         ButterKnife.bind(this);
+        param = WorkUtils.simpleParam();
     }
 
 
     @Override
     protected void initData() {
-        getData();
-    }
-
-    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++;
-//                }
-//            }
-//        });
     }
 
 
@@ -96,5 +68,57 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
         return R.layout.activity_mes_search_cnd;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_finish, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.finish:
+                if (!TextUtils.isEmpty(etClient.getText().toString())) {
+                    param.put("customerUserName", etClient.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etDrawing.getText().toString())) {
+                    param.put("drawingNumberProd", etDrawing.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etImgCode.getText().toString())) {
+                    param.put("drawingNumberProc", etImgCode.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etName.getText().toString())) {
+                    param.put("productName", etName.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etSection.getText().toString())) {
+                    param.put("fractureSurface", etSection.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etSeries.getText().toString())) {
+                    param.put("seriesName", etSeries.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etSpec.getText().toString())) {
+                    param.put("specification", etSpec.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etSteel.getText().toString())) {
+                    param.put("steelGrade", etSteel.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etType.getText().toString())) {
+                    param.put("productType", etType.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etWeight.getText().toString())) {
+                    param.put("weight", etWeight.getText().toString());
+                }
+                if (!TextUtils.isEmpty(etYears.getText().toString())) {
+                    param.put("designedLife", etYears.getText().toString());
+                }
+                Intent intent = new Intent();
+                intent.putExtra("param", JSON.toJSONString(param));
+                setResult(10001, intent);
+                finish();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
 
 }

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

@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.ProPriceBean;
+import com.wd.workoffice.bean.mesBean.SearchBean;
 
 import java.util.List;
 
@@ -12,7 +13,7 @@ import java.util.List;
  * Created by flexible on 2018/8/13.
  */
 
-public class MesSearchAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean, BaseViewHolder> {
+public class MesSearchAdapter extends BaseQuickAdapter<SearchBean.ListBean, BaseViewHolder> {
 
     public MesSearchAdapter(int layoutResId, List data) {
         super(layoutResId, data);
@@ -20,7 +21,11 @@ public class MesSearchAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean,
 
 
     @Override
-    protected void convert(BaseViewHolder helper, ProPriceBean.RecordsBean item) {
+    protected void convert(BaseViewHolder helper, SearchBean.ListBean item) {
+        helper.setText(R.id.tv_code,item.getCustomerUserCode());
+        helper.setText(R.id.tv_machine,item.getContinuousCasterName());
+        helper.setText(R.id.tv_name,item.getCustomerUserName());
+        helper.setText(R.id.tv_factory,item.getSteelmakingWorksName());
     }
 }
 

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

@@ -7,6 +7,7 @@
 
 
     <TextView
+        android:id="@+id/tv_code"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -15,6 +16,7 @@
         android:textSize="12sp" />
 
     <TextView
+        android:id="@+id/tv_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -23,6 +25,7 @@
         android:textSize="12sp" />
 
     <TextView
+        android:id="@+id/tv_factory"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -31,6 +34,7 @@
         android:textSize="12sp" />
 
     <TextView
+        android:id="@+id/tv_machine"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"