1.工单列表样式

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

app/src/main/java/com/wd/workoffice/bean/event/AddSummarytEvent.java

+package com.wd.workoffice.bean.event;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class AddSummarytEvent {
+
+    public AddSummarytEvent() {
+    }
+}

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

@@ -86,7 +86,7 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/msWorkSummary/save.json")
-    Observable<BaseMesBean> summaryAdd(@Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> summaryAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
     /**
      * 工作总结新增

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

@@ -324,7 +324,7 @@ public class MesTicketAddActivity extends WorkToolBarActivity {
                     return;
                 }
                 finish();
-                toast("添加成功");
+                toast("提交成功");
                 EventBus.getDefault().post(new AddTicketEvent());
             }
         });

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

@@ -17,6 +17,8 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.AddSummarytEvent;
+import com.wd.workoffice.bean.event.AddTicketEvent;
 import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.bean.mesBean.TicketBean;
@@ -25,6 +27,9 @@ import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.util.DialogUtils;
 import com.wd.workoffice.util.WorkUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
 import java.util.Map;
 
 import androidx.annotation.Nullable;
@@ -118,6 +123,8 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
                     param.put("productDrawingConfirmation", 1);
                 else
                     param.put("productDrawingConfirmation", 0);
+                dialog.dismiss();
+                tvDesignConfirm.setText(which == 0 ? "是" : "否");
             }
         });
     }
@@ -127,6 +134,8 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
     protected void initData() {
         param = WorkUtils.simpleParam();
         param.put("jobNo", data.getJobNo());
+        param.put("jobTypeId", data.getJobTypeId());
+        param.put("dataCollectionStatus", 1);
     }
 
     private void submit() {
@@ -157,7 +166,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
             }
         }
         param.put("completionSituation", etClient.getText().toString());
-        RtfUtils.getMesRtf().summaryAdd("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        RtfUtils.getMesRtf().summaryAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
 
 
             @Override
@@ -177,6 +186,10 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
+                finish();
+                EventBus.getDefault().post(new AddTicketEvent());
+                EventBus.getDefault().post(new AddSummarytEvent());
+                toast("提交成功");
             }
         });
     }

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

@@ -14,6 +14,8 @@ import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.bean.event.AddSummarytEvent;
+import com.wd.workoffice.bean.event.AddTicketEvent;
 import com.wd.workoffice.bean.mesBean.JobTypeBean;
 import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -21,6 +23,9 @@ import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.JobTypeAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.List;
 import java.util.Map;
 
@@ -96,7 +101,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
             if (data.getJobStatus() == 1) {
                 btnReceive.setVisibility(View.VISIBLE);
             }
-            if (data.getJobStatus() == 1) {
+            if (data.getJobStatus() == 1 && TextUtils.isEmpty(data.getAcceptUserId())) {
                 btnReceive.setVisibility(View.VISIBLE);
             }
             if (data.getJobStatus() == 2) {
@@ -107,9 +112,6 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
         } else {
             rlAddLog.setVisibility(View.GONE);
         }
-        rlAddLog.setVisibility(View.VISIBLE);
-        llBottom.setVisibility(View.VISIBLE);
-        btnSubmit.setVisibility(View.VISIBLE);
         tvCode.setText(data.getJobNo());
         tvClient.setText(data.getCustomerUserName());
         tvCompany.setText(data.getSalesCompanyName());
@@ -160,10 +162,9 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
         param = WorkUtils.simpleParam();
         param.put("jobStatus", 1);
         param.put("jobNo", data.getJobNo());
-        param.put("acceptUserId", 1);
-        param.put("acceptUserName", 1);
-        param.put("jobUserId", 1);
-//        getData();
+        param.put("acceptUserId", data.getJobUserId());
+        param.put("acceptUserName", data.getJobUserName());
+        param.put("jobUserId", data.getJobUserId());
     }
 
     private void getData() {
@@ -244,8 +245,29 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
                     return;
                 }
                 toast("接收成功");
+                EventBus.getDefault().post(new AddTicketEvent());
+                btnSubmit.setVisibility(View.VISIBLE);
+                btnReceive.setVisibility(View.GONE);
+                rlLog.setVisibility(View.GONE);
+                rlAddLog.setVisibility(View.VISIBLE);
             }
         });
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
 
+    @Subscribe
+    public void refresh(AddSummarytEvent event) {
+        finish();
     }
 }

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

 package com.wd.workoffice.ui.activity.mes.ticket;
 
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.event.AddDepEvent;
 import com.wd.workoffice.bean.event.AddTicketEvent;
-import com.wd.workoffice.bean.listener.FourMenuClickListener;
 import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.MesTicketAdapter;
 import com.wd.workoffice.util.WorkUtils;
-import com.wd.workoffice.util.ddmfilter.MesTicketListFilterData;
-import com.wd.workoffice.widget.DropDownMenu;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -31,6 +27,7 @@ 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;
@@ -46,70 +43,25 @@ import io.reactivex.disposables.Disposable;
  **/
 public class MesTicketListActivity extends WorkToolBarActivity {
 
-    @BindView(R.id.ddm_choose)
-    DropDownMenu ddmChoose;
-    @BindView(R.id.fab_go)
-    FloatingActionButton fabGo;
-    private RecyclerView rvData;
+    @BindView(R.id.tv_go)
+    TextView tvGo;
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    @BindView(R.id.btn_add)
+    Button btnAdd;
     private int page = 1;
     private Map<String, Object> param;
-    private SmartRefreshLayout srlRefresh;
     private List<TicketBean.ListBean> dataList;
     private MesTicketAdapter dataAdapter;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        MesTicketListFilterData filterData = new MesTicketListFilterData(this, ddmChoose, new FourMenuClickListener() {
-            @Override
-            public void clickOne(String value) {
-                if (TextUtils.equals(value, "全部状态")) {
-                    param.put("level", "");
-                } else if (TextUtils.equals(value, "一级库")) {
-                    param.put("level", "1");
-                } else {
-                    param.put("level", "2");
-                }
-                page = 1;
-                param.put("pageNum", page);
-                getData();
-            }
-
-            @Override
-            public void clickTwo(String value) {
-                if (TextUtils.equals(value, "全部类型")) {
-                    param.put("type", "");
-                } else if (TextUtils.equals(value, "厂内库")) {
-                    param.put("type", "IN");
-                } else {
-                    param.put("type", "OUT");
-                }
-                page = 1;
-                param.put("page", page);
-                getData();
-            }
-
-            @Override
-            public void clickThree(String value) {
-                if (TextUtils.equals(value, "全部状态")) {
-                    param.put("status", "");
-                } else if (TextUtils.equals(value, "未启用")) {
-                    param.put("status", "0");
-                } else {
-                    param.put("status", "1");
-                }
-                page = 1;
-                param.put("pageNum", page);
-                getData();
-            }
-
-            @Override
-            public void clickFour(String value) {
-
-            }
-        });
-        rvData = filterData.getRvData();
-        srlRefresh = filterData.getSrlRefresh();
+        tvGo.setText("任务担当\n" +
+                "页面");
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
     }
 
 
@@ -222,12 +174,6 @@ public class MesTicketListActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick(R.id.fab_go)
-    public void onViewClicked() {
-        startActivity(MesTicketListTakeOnActivity.class);
-        finish();
-    }
-
     @Override
     public void onStart() {
         super.onStart();
@@ -246,4 +192,17 @@ public class MesTicketListActivity extends WorkToolBarActivity {
         param.put("pageNum", page);
         getData();
     }
+
+    @OnClick({R.id.tv_go, R.id.btn_add})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_go:
+                startActivity(MesTicketListTakeOnActivity.class);
+                finish();
+                break;
+            case R.id.btn_add:
+                startActivity(MesTicketAddActivity.class);
+                break;
+        }
+    }
 }

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

 package com.wd.workoffice.ui.activity.mes.ticket;
 
-import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuItem;
+import android.os.Bundle;
 import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -11,19 +11,17 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.listener.FourMenuClickListener;
 import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.MesTicketAdapter;
 import com.wd.workoffice.util.WorkUtils;
-import com.wd.workoffice.util.ddmfilter.MesTicketListFilterData;
-import com.wd.workoffice.widget.DropDownMenu;
 
 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;
@@ -40,68 +38,25 @@ import io.reactivex.disposables.Disposable;
  **/
 public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
 
-    @BindView(R.id.ddm_choose)
-    DropDownMenu ddmChoose;
-    private RecyclerView rvData;
+    @BindView(R.id.tv_go)
+    TextView tvGo;
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    @BindView(R.id.btn_add)
+    Button btnAdd;
     private int page = 1;
     private Map<String, Object> param;
-    private SmartRefreshLayout srlRefresh;
     private List<TicketBean.ListBean> dataList;
     private MesTicketAdapter dataAdapter;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        MesTicketListFilterData filterData = new MesTicketListFilterData(this, ddmChoose, new FourMenuClickListener() {
-            @Override
-            public void clickOne(String value) {
-                if (TextUtils.equals(value, "全部状态")) {
-                    param.put("level", "");
-                } else if (TextUtils.equals(value, "一级库")) {
-                    param.put("level", "1");
-                } else {
-                    param.put("level", "2");
-                }
-                page = 1;
-                param.put("pageNum", page);
-                getData();
-            }
-
-            @Override
-            public void clickTwo(String value) {
-                if (TextUtils.equals(value, "全部类型")) {
-                    param.put("type", "");
-                } else if (TextUtils.equals(value, "厂内库")) {
-                    param.put("type", "IN");
-                } else {
-                    param.put("type", "OUT");
-                }
-                page = 1;
-                param.put("page", page);
-                getData();
-            }
-
-            @Override
-            public void clickThree(String value) {
-                if (TextUtils.equals(value, "全部状态")) {
-                    param.put("status", "");
-                } else if (TextUtils.equals(value, "未启用")) {
-                    param.put("status", "0");
-                } else {
-                    param.put("status", "1");
-                }
-                page = 1;
-                param.put("pageNum", page);
-                getData();
-            }
-
-            @Override
-            public void clickFour(String value) {
-
-            }
-        });
-        rvData = filterData.getRvData();
-        srlRefresh = filterData.getSrlRefresh();
+        tvGo.setText("市场服务\n" +
+                "页面");
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
     }
 
 
@@ -194,10 +149,16 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
         return R.layout.activity_mes_ticket_list;
     }
 
-    @OnClick(R.id.fab_go)
-    public void onViewClicked() {
-        startActivity(MesTicketListActivity.class);
+    @OnClick({R.id.tv_go, R.id.btn_add})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_go:
+                startActivity(MesTicketListTakeOnActivity.class);
                 finish();
+                break;
+            case R.id.btn_add:
+                startActivity(MesTicketAddActivity.class);
+                break;
+        }
     }
-
 }

app/src/main/res/drawable/shape_ticket_go.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="180"
+        android:endColor="#ffe36c6c"
+        android:startColor="#fff3a5a5"
+        android:type="linear"
+        android:useLevel="true" />
+    <item android:name="android:shadowColor">#40000000</item>
+    <item android:name="android:shadowDx">0</item>
+    <item android:name="android:shadowDy">5</item>
+    <corners android:radius="180mm" />
+</shape>
\ No newline at end of file

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

@@ -5,28 +5,84 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/srl_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_go"
-        android:layout_width="70mm"
-        android:layout_height="70mm"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="30mm"
-        app:backgroundTint="#FFF3A5A5"
-        app:elevation="3dp" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="16mm">
 
-    <com.wd.workoffice.widget.DropDownMenu
-        android:id="@+id/ddm_choose"
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="客户姓名"
+                    android:textColor="@color/flexible_text_sup"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="产品名称"
+                    android:textColor="@color/flexible_text_sup"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="制单日期"
+                    android:textColor="@color/flexible_text_sup"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="任务状态"
+                    android:textColor="@color/flexible_text_sup"
+                    android:textSize="12sp" />
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_data"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-        app:dddividerColor="@color/divider"
-        app:ddmaskColor="#4d000000"
-        app:ddmenuBackgroundColor="@color/white"
-        app:ddmenuMenuHeightPercent="0.5"
-        app:ddmenuSelectedIcon="@mipmap/main_top"
-        app:ddmenuTextSize="13sp"
-        app:ddmenuUnselectedIcon="@mipmap/main_down"
-        app:ddtextSelectedColor="@color/mainTextColor"
-        app:ddtextUnselectedColor="@color/main_icon_select"
-        app:ddunderlineColor="@color/white" />
+                android:background="@android:color/white" />
+        </LinearLayout>
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+    <TextView
+        android:id="@+id/tv_go"
+        android:layout_width="60mm"
+        android:layout_height="60mm"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="30mm"
+        android:background="@drawable/shape_ticket_go"
+        android:gravity="center"
+        android:textColor="@color/white" />
+
+    <Button
+        android:id="@+id/btn_add"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20mm"
+        android:background="@color/blue_btn"
+        android:text="新建"
+        android:textColor="@color/white" />
 </RelativeLayout>
\ No newline at end of file