1.修改产品列表bug

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

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

@@ -1869,4 +1869,13 @@ public interface ApiService {
      */
     @PUT("/equipmentRepair/finish/{orderId}")
     Observable<BaseBean> equipmentRepairFinish(@Path("orderId") String orderId);
+
+
+    /**
+     * 产品
+     *
+     * @return
+     */
+    @GET("/product/process-list")
+    Observable<BaseBean> productProcess();
 }

app/src/main/java/com/wd/workoffice/ui/fg/WorkProFragment.java

@@ -74,13 +74,7 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
 
             @Override
             public void clickTwo(String value) {
-                if (TextUtils.equals(value, "全部状态")) {
-                    param.put("status", "");
-                } else if (TextUtils.equals(value, "正常")) {
-                    param.put("status", "1");
-                } else {
-                    param.put("status", "0");
-                }
+                param.put("processType", value);
                 page = 1;
                 param.put("current", page);
                 workProPresenter.getPro(param);
@@ -275,12 +269,12 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
         page = 1;
         param.put("current", page);
         workProPresenter.getPro(param);
-        toast(msg);
+        toast("修改成功");
     }
 
     @Override
     public void onSale(String msg) {
-        toast(msg);
+        toast("操作成功");
         page = 1;
         param.put("current", page);
         workProPresenter.getPro(param);

app/src/main/java/com/wd/workoffice/util/ddmfilter/ProFilterData.java

@@ -4,19 +4,30 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkApp;
+import com.wd.workoffice.bean.event.AddDeviceEvent;
 import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.FilterAdapter;
+import com.wd.workoffice.util.WorkUtils;
 import com.wd.workoffice.widget.DropDownMenu;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
 
 /**
  * author : flexible
@@ -30,17 +41,22 @@ public class ProFilterData {
     private RecyclerView rvData;
     private SmartRefreshLayout srlRefresh;
     private List<String> statusList = Arrays.asList("全部状态", "正常", "冻结");
-    private List<String> processList = Arrays.asList("全部流程", "外采购流程", "供应流程", "销售流程", "坩埚流程");
+    //    private List<String> processList = Arrays.asList("全部流程", "外采购流程", "供应流程", "销售流程", "坩埚流程");
+    private List<String> processList = new ArrayList<>();
+    private List<JSONObject> processDataList = new ArrayList<>();
     private List<String> onSaleList = Arrays.asList("全部", "已上架", "未上架");
     ThreeMenuClickListener listener;
 
     String[] TABLIST = new String[]{"全部状态", "全部流程", "是否上架"};
     Context context;
-    public ProFilterData(Context context , DropDownMenu menu, ThreeMenuClickListener listener) {
+    private FilterAdapter processAdapter;
+
+    public ProFilterData(Context context, DropDownMenu menu, ThreeMenuClickListener listener) {
         this.context = context;
         this.menu = menu;
         this.listener = listener;
         initView();
+        getData();
     }
 
 
@@ -51,11 +67,39 @@ public class ProFilterData {
         rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
         viewList = new ArrayList<>();
         addTabView(statusList, 1);
-        addTabView(processList, 2);
+        addProcessTabView(processList, 2);
         addTabView(onSaleList, 3);
         menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
     }
 
+    private void addProcessTabView(List<String> dataList, int type) {
+        View view = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_filter_pro, null);
+        RecyclerView rvData = view.findViewById(R.id.rv_filter);
+        rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
+        processAdapter = new FilterAdapter(R.layout.item_filter, dataList);
+        processAdapter.bindToRecyclerView(rvData);
+        viewList.add(view);
+        processAdapter.setOnItemClickListener((adapter, v, position) -> {
+            processAdapter.setChoosePos(position);
+            menu.setTabText(dataList.get(position));
+            if (listener != null) {
+                switch (type) {
+                    case 1:
+                        listener.clickOne(dataList.get(position));
+                        break;
+                    case 2:
+                        listener.clickTwo(processDataList.get(position).getString("subKey"));
+                        break;
+                    case 3:
+                        listener.clickThree(dataList.get(position));
+                        break;
+                }
+            }
+            menu.closeMenu();
+            processAdapter.notifyDataSetChanged();
+        });
+    }
+
     private void addTabView(List<String> dataList, int type) {
         View view = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_filter_pro, null);
         RecyclerView rvData = view.findViewById(R.id.rv_filter);
@@ -84,6 +128,32 @@ public class ProFilterData {
         });
     }
 
+    private void getData() {
+        RtfUtils.getRtf().productProcess().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                if (data.getCode() != 0) {
+                    return;
+                }
+                JSONObject all = new JSONObject();
+                all.put("name", "全部流程");
+                processDataList.add(all);
+                processDataList.addAll(JSON.parseArray(data.getData().toString(), JSONObject.class));
+                for (JSONObject process : processDataList) {
+                    processList.add(process.getString("name"));
+                }
+                processAdapter.notifyDataSetChanged();
+            }
+        });
+    }
 
     public SmartRefreshLayout getSrlRefresh() {
         return srlRefresh;
@@ -98,7 +168,6 @@ public class ProFilterData {
         return rvData;
     }
 
-
     public void setRvData(RecyclerView rvData) {
         this.rvData = rvData;
     }