1.修改mes工单

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

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

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

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

@@ -16,6 +16,7 @@ import com.tbruyelle.rxpermissions2.RxPermissions;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.AddLogEvent;
 import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -27,6 +28,8 @@ import com.zhihu.matisse.Matisse;
 import com.zhihu.matisse.MimeType;
 import com.zhihu.matisse.internal.entity.CaptureStrategy;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -112,6 +115,7 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
                     return;
                 }
                 finish();
+                EventBus.getDefault().post(new AddLogEvent());
                 toast("添加成功");
             }
         });

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

@@ -62,7 +62,7 @@ public class MesTicketClientActivity extends WorkToolBarActivity {
             setTitle(getIntent().getStringExtra("supplier"));
         }
         clientList = new ArrayList<>();
-        clientAdapter = new MesClientAdapter(R.layout.item_store_client, clientList);
+        clientAdapter = new MesClientAdapter(R.layout.item_user_data_client, clientList);
         clientAdapter.bindToRecyclerView(rvClient);
         clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
         paramMap = WorkUtils.simpleParam();

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

@@ -104,10 +104,16 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
                 if (WorkUtils.hasMesMenuPermission(JSON.parseArray(getIntent().getStringExtra("permission")), "总结")) {
                     btnSubmit.setVisibility(View.VISIBLE);
                 }
+            }
+        }
+        if (data.getJobStatus() ==2) {
             rlLog.setVisibility(View.GONE);
             rlAddLog.setVisibility(View.VISIBLE);
-            }
-        } else {
+        } else if (data.getJobStatus()>2){
+            rlLog.setVisibility(View.VISIBLE);
+            rlAddLog.setVisibility(View.GONE);
+        }else {
+            rlLog.setVisibility(View.GONE);
             rlAddLog.setVisibility(View.GONE);
         }
         tvCode.setText(data.getJobNo());

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

@@ -115,6 +115,8 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
     RecyclerView rvAnnex;
     @BindView(R.id.tv_finish_confirm)
     TextView tvFinishConfirm;
+    @BindView(R.id.rl_finish)
+    RelativeLayout rlFinish;
     private SummaryBean dataBean;
     private List<ImageBean> imgList;
     private ImgAdapter imgAdapter;
@@ -234,7 +236,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
     private void setViewData() {
         tvFinishConfirm.setText(dataBean.getDataCollectionStatus() == 1 ? "完成" : "未完成");
         if (TextUtils.equals(data.getJobTypeId(), "01")) {
-            tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() ==1 ? "确认" : "未确认");
+            tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() == 1 ? "确认" : "未确认");
             etDesign1.setText(dataBean.getSiteInvestigation());
             etDesign2.setText(dataBean.getFeasibilityReport());
         } else if (TextUtils.equals(data.getJobTypeId(), "02")) {
@@ -277,6 +279,8 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
             llTech.setVisibility(View.VISIBLE);
         } else if (TextUtils.equals(data.getJobTypeId(), "05")) {
             llTender.setVisibility(View.VISIBLE);
+        } else {
+//            rlFinish.setVisibility(View.GONE);
         }
     }
 

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

@@ -106,6 +106,8 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
     TextView tvScore;
     @BindView(R.id.tv_finish_confirm)
     TextView tvFinishConfirm;
+    @BindView(R.id.rl_finish)
+    RelativeLayout rlFinish;
     private StarAdapter starAdapter;
     private List<ImageBean> imgList;
     private ImgAdapter imgAdapter;
@@ -194,7 +196,7 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
     private void setViewData() {
         tvFinishConfirm.setText(dataBean.getDataCollectionStatus() == 1 ? "完成" : "未完成");
         if (TextUtils.equals(data.getJobTypeId(), "01")) {
-            tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() ==1 ? "确认" : "未确认");
+            tvDesignConfirm.setText(dataBean.getProductDrawingConfirmation() == 1 ? "确认" : "未确认");
             etDesign1.setText(dataBean.getSiteInvestigation());
             etDesign2.setText(dataBean.getFeasibilityReport());
         } else if (TextUtils.equals(data.getJobTypeId(), "02")) {
@@ -235,6 +237,8 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
             llTech.setVisibility(View.VISIBLE);
         } else if (TextUtils.equals(data.getJobTypeId(), "05")) {
             llTender.setVisibility(View.VISIBLE);
+        }else {
+//            rlFinish.setVisibility(View.GONE);
         }
     }
 
@@ -247,10 +251,4 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
         }
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
 }

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

@@ -11,6 +11,8 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.AddLogEvent;
+import com.wd.workoffice.bean.event.ModifyUserDataEvent;
 import com.wd.workoffice.bean.mesBean.LogBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
@@ -18,6 +20,9 @@ import com.wd.workoffice.ui.activity.bat.order.SendApplyAddActivity;
 import com.wd.workoffice.ui.adapter.MesTicketLogAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -140,4 +145,20 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+    @Subscribe
+    public void refresh(AddLogEvent event) {
+        getData();
+    }
 }

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

@@ -23,7 +23,6 @@ public class ChooseBoxAdapter extends BaseQuickAdapter<BoxBean, BaseViewHolder>
         helper.setText(R.id.tv_name, item.getBoxId());
         helper.setText(R.id.tv_person, item.getProductCode());
         helper.setText(R.id.tv_sale, item.getProductName());
-
     }
 }
 

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

@@ -21,6 +21,8 @@ public class MesClientAdapter extends BaseQuickAdapter<MesClientBean.ListBean, B
     @Override
     protected void convert(BaseViewHolder helper, MesClientBean.ListBean item) {
         helper.setText(R.id.tv_name, item.getCustomerName());
+        helper.setText(R.id.tv_person, item.getSalesManagerName() );
+        helper.setText(R.id.tv_sale, item.getSalesCompanyName());
     }
 }
 

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

@@ -71,7 +71,7 @@ public class DeviceRepairListFragment extends WorkBaseFg {
         param = WorkUtils.pageKey();
         if (!TextUtils.isEmpty(state))
             param.put("status", state);
-        param.put("launchDeptId", UserKeeper.getInstance().getUserId());
+        param.put("launchDeptId", UserKeeper.getInstance().getUserDepId());
         page = 1;
         param.put("current", page);
         dataList = new ArrayList<>();

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

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@android:color/white"
     android:orientation="vertical">
 
     <LinearLayout
@@ -41,8 +42,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@id/ll_bottom"
-        android:paddingHorizontal="10mm"
-        android:paddingVertical="8mm">
+       >
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -222,6 +222,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
+                android:layout_marginBottom="10mm"
                 android:paddingHorizontal="10mm" />
 
             <View style="@style/dividerX" />

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

@@ -219,7 +219,31 @@
                 style="@style/dividerX"
                 android:layout_marginTop="15mm" />
 
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:text="任务担当"
+                    android:textSize="14sp" />
 
+                <TextView
+                    android:id="@+id/tv_take_on"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="3mm"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="14sp" />
+
+            </RelativeLayout>
+            <View style="@style/dividerX" />
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -349,33 +373,6 @@
 
             </RelativeLayout>
 
-            <View style="@style/dividerX" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="20mm"
-                android:paddingVertical="9mm">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:text="任务担当"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/tv_take_on"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="3mm"
-                    android:textColor="@color/flexible_text_gray"
-                    android:textSize="14sp" />
-
-            </RelativeLayout>
-
             <View style="@style/ViewX" />
 
             <RelativeLayout

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

@@ -89,7 +89,9 @@
                 android:textSize="14sp" />
 
             <View style="@style/dividerX" />
+
             <RelativeLayout
+                android:id="@+id/rl_finish"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingVertical="9mm">

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

@@ -127,6 +127,7 @@
                 <View style="@style/dividerX" />
 
                 <RelativeLayout
+                    android:id="@+id/rl_finish"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingVertical="9mm">

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

@@ -23,15 +23,27 @@
                 android:layout_height="wrap_content"
                 android:text="资料完成情况"
                 android:textSize="14sp" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:gravity="center_vertical">
 
                 <TextView
                     android:id="@+id/tv_finish_confirm"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="10mm"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginRight="3mm"
                     android:text="请选择"
+                    android:textColor="@color/flexible_text_gray"
                     android:textSize="14sp" />
+
+                <ImageView
+                    android:layout_width="15mm"
+                    android:layout_height="20mm"
+                    android:src="@mipmap/arrow_right_gray" />
+            </LinearLayout>
         </RelativeLayout>
 
         <View style="@style/dividerX" />
@@ -55,15 +67,27 @@
                     android:layout_height="wrap_content"
                     android:text="产品图纸确认"
                     android:textSize="14sp" />
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center_vertical">
 
                     <TextView
                         android:id="@+id/tv_design_confirm"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="10mm"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginRight="3mm"
                         android:text="请选择"
+                        android:textColor="@color/flexible_text_gray"
                         android:textSize="14sp" />
+
+                    <ImageView
+                        android:layout_width="15mm"
+                        android:layout_height="20mm"
+                        android:src="@mipmap/arrow_right_gray" />
+                </LinearLayout>
             </RelativeLayout>
 
             <View style="@style/dividerX" />
@@ -598,6 +622,7 @@
             android:paddingHorizontal="20mm"
             android:paddingVertical="13mm"
             android:text="备注：jpg"
+            android:visibility="gone"
             android:textSize="14sp" />
 
         <View style="@style/dividerX" />
@@ -628,6 +653,7 @@
             android:layout_height="wrap_content"
             android:paddingHorizontal="20mm"
             android:paddingVertical="13mm"
+            android:visibility="gone"
             android:text="备注：pdf、word、excel"
             android:textSize="14sp" />
     </LinearLayout>

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

@@ -3,8 +3,21 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingVertical="20mm">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textSize="17sp"
+        android:text="工单评分" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20mm"
         android:gravity="center"
-    android:paddingVertical="20mm"
         android:orientation="horizontal">
 
         <androidx.recyclerview.widget.RecyclerView
@@ -19,4 +32,6 @@
             android:layout_marginHorizontal="10mm"
             android:text="0分"
             android:textSize="19sp" />
+    </LinearLayout>
+
 </LinearLayout>