1.修改工单产品接口

2.去除检维修记录的点检差点
3.TODO 点维修详情+单独菜单

app/src/main/AndroidManifest.xml

@@ -1330,7 +1330,15 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.mes.ticket.MesTicketProActivity"
+            android:name=".ui.activity.mes.MesProActivity"
+            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.ticket.TicketProActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="选择产品"
             android:launchMode="singleTop"

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

@@ -155,6 +155,14 @@ public interface MesApiService {
     @POST("/himes/api/product/show/list.json")
     Observable<BaseMesBean> proList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+    /**
+     * 工单产品
+     *
+     * @return
+     */
+    @POST("/msWorkOrder/show/pageByCustomer.json")
+    Observable<BaseMesBean> ticketProList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
      * 产品
      *

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

+package com.wd.workoffice.ui.activity.mes;
+
+import android.content.Intent;
+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.MesProBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.MesProAdapter;
+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 MesProActivity 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<MesProBean.ListBean> clientList;
+    private MesProAdapter 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 MesProAdapter(R.layout.item_store_client, clientList);
+        clientAdapter.bindToRecyclerView(rvClient);
+        clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
+        param = WorkUtils.pageMesKey();
+        paramMap = WorkUtils.simpleParam();
+        param.put("paramMap",paramMap);
+        param.put("pageNum", 1);
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().proList("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<MesProBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesProBean.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("productName", etKey.getText().toString());
+        param.put("pageNum", 1);
+        page = 1;
+        getData();
+    }
+}

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

@@ -33,9 +33,7 @@ public class MesServiceActivity extends WorkToolBarActivity {
     @BindView(R.id.vp_data)
     ViewPager vpData;
     private String tab[] = {
-            "点检记录", "润滑记录", "检修记录"};
-    private String order[] = {
-            "0", "1", "2"};
+            "点检记录",  "检修记录"};
 
     @Override
     protected void initView() {
@@ -49,10 +47,10 @@ public class MesServiceActivity extends WorkToolBarActivity {
         FragmentManager sfm = getSupportFragmentManager();
         List<Fragment> data = new ArrayList<>();
         MesCheckFragment checkFragment = new MesCheckFragment();
-        MesLubricatingFragment lubricatingFragment = new MesLubricatingFragment();
+//        MesLubricatingFragment lubricatingFragment = new MesLubricatingFragment();
         MesServiceFragment serviceFragment = new MesServiceFragment();
         data.add(checkFragment);
-        data.add(lubricatingFragment);
+//        data.add(lubricatingFragment);
         data.add(serviceFragment);
         VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
         vpData.setAdapter(vpFgAdapter);

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddActivity.java

@@ -285,7 +285,7 @@ public class MesTicketAddActivity extends WorkToolBarActivity {
         String startTime = tvStartTime.getText().toString();
         String endTime = tvEndTime.getText().toString();
         if (TextUtils.isEmpty(startTime)||TextUtils.isEmpty(endTime)){
-            toast("情选择开始结束时间");
+            toast("请选择开始结束时间");
             return;
         }
         if (chooseClient != null) {

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddSummaryActivity.java

@@ -29,6 +29,7 @@ import com.wd.workoffice.bean.mesBean.MesProBean;
 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.MesProActivity;
 import com.wd.workoffice.ui.adapter.AnnexAdapter;
 import com.wd.workoffice.ui.adapter.ImgAddAdapter;
 import com.wd.workoffice.util.DialogUtils;
@@ -270,13 +271,13 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
                 proDialog.show();
                 break;
             case R.id.rl_try_pro:
-                startActivityForResult(MesTicketProActivity.class, 10001);
+                startActivityForResult(TicketProActivity.class, 10001);
                 break;
             case R.id.rl_tech_pro:
-                startActivityForResult(MesTicketProActivity.class, 10001);
+                startActivityForResult(TicketProActivity.class, 10001);
                 break;
             case R.id.rl_quality_pro:
-                startActivityForResult(MesTicketProActivity.class, 10001);
+                startActivityForResult(TicketProActivity.class, 10001);
                 break;
         }
     }

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketProActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/TicketProActivity.java

@@ -34,7 +34,7 @@ import io.reactivex.disposables.Disposable;
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
  **/
-public class MesTicketProActivity extends WorkToolBarActivity {
+public class TicketProActivity extends WorkToolBarActivity {
 
     @BindView(R.id.et_key)
     EditText etKey;

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

@@ -24,7 +24,7 @@ import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
+import com.wd.workoffice.ui.activity.mes.MesProActivity;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
 import com.wd.workoffice.util.WorkUtils;
@@ -185,7 +185,7 @@ public class MesPackageAddActivity extends WorkToolBarActivity {
                 addImg(3);
                 break;
             case R.id.rl_pro:
-                startActivityForResult(MesTicketProActivity.class, 10001);
+                startActivityForResult(MesProActivity.class, 10001);
                 break;
 
         }

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

@@ -25,7 +25,7 @@ import com.wd.workoffice.bean.mesBean.MachineDetailBean;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
+import com.wd.workoffice.ui.activity.mes.MesProActivity;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
 import com.wd.workoffice.util.WorkUtils;
@@ -298,7 +298,7 @@ public class MesPackageModifyActivity extends WorkToolBarActivity {
                 addImg(3);
                 break;
             case R.id.rl_pro:
-                startActivityForResult(MesTicketProActivity.class, 10001);
+                startActivityForResult(MesProActivity.class, 10001);
                 break;
 
         }

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

@@ -17,7 +17,6 @@ import com.wd.workoffice.bean.event.RefreshMachineEvent;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;

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

@@ -18,7 +18,6 @@ import com.wd.workoffice.bean.mesBean.MachineDetailBean;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;

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

@@ -5,7 +5,6 @@ import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -19,7 +18,7 @@ import com.wd.workoffice.bean.event.RefreshMachineEvent;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
+import com.wd.workoffice.ui.activity.mes.MesProActivity;
 import com.wd.workoffice.util.PickTimeUtils;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -155,7 +154,7 @@ public class MesSupplierAddActivity extends WorkToolBarActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.rl_pro_code:
-                startActivityForResult(MesTicketProActivity.class, 10001
+                startActivityForResult(MesProActivity.class, 10001
                         , "from", "1");
                 break;
             case R.id.rl_time:

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

 package com.wd.workoffice.ui.activity.mes.user;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -20,7 +19,7 @@ import com.wd.workoffice.bean.mesBean.MachineDetailBean;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
+import com.wd.workoffice.ui.activity.mes.MesProActivity;
 import com.wd.workoffice.util.PickTimeUtils;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -207,7 +206,7 @@ public class MesSupplierModifyActivity extends WorkToolBarActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.rl_pro_code:
-                startActivityForResult(MesTicketProActivity.class, 10001
+                startActivityForResult(MesProActivity.class, 10001
                         , "from", "1");
                 break;
             case R.id.rl_time:

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

@@ -25,7 +25,7 @@ import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
+import com.wd.workoffice.ui.activity.mes.MesProActivity;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
 import com.wd.workoffice.util.WorkUtils;
@@ -216,7 +216,7 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
             case R.id.rl_time:
                 break;
             case R.id.rl_pro:
-                startActivityForResult(MesTicketProActivity.class, 10001);
+                startActivityForResult(MesProActivity.class, 10001);
                 break;
 
         }

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

@@ -25,7 +25,7 @@ import com.wd.workoffice.bean.mesBean.MachineDetailBean;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
+import com.wd.workoffice.ui.activity.mes.MesProActivity;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
 import com.wd.workoffice.util.WorkUtils;
@@ -334,7 +334,7 @@ public class MesThreeModifyActivity extends WorkToolBarActivity {
             case R.id.rl_time:
                 break;
             case R.id.rl_pro:
-                startActivityForResult(MesTicketProActivity.class, 10001);
+                startActivityForResult(MesProActivity.class, 10001);
                 break;
 
         }