1.详情数据审核

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

app/src/main/java/com/wd/workoffice/bean/mesBean/UserDataDetailBean.java

@@ -270,7 +270,7 @@ public class UserDataDetailBean {
             private String approvalUserName;
             private long approvalDateTime;
             private int approvalStatus;
-            private Object remark;
+            private String remark;
             private Object treeId;
             private Object treeName;
             private Object treeParentId;
@@ -458,11 +458,11 @@ public class UserDataDetailBean {
                 this.approvalStatus = approvalStatus;
             }
 
-            public Object getRemark() {
+            public String getRemark() {
                 return remark;
             }
 
-            public void setRemark(Object remark) {
+            public void setRemark(String remark) {
                 this.remark = remark;
             }
 

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

@@ -180,6 +180,7 @@ public interface MesApiService {
      */
     @POST("/himes/api/msContinuousCasterInfo/show/list.json")
     Observable<BaseMesBean> machineList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
      * 连铸机详情
      *
@@ -194,22 +195,23 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/msContinuousProducts/save.json")
-    Observable<BaseMesBean> threeAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
+    Observable<BaseMesBean> threeAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
-      /**
+    /**
      * otherSupplierAdd
      *
      * @return
      */
     @POST("/himes/api/msSupplierSupply/save.json")
-    Observable<BaseMesBean> otherSupplierAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
+    Observable<BaseMesBean> otherSupplierAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
+
     /**
      * otherSupplierAdd
      *
      * @return
      */
     @POST("/himes/api/msLadleRefractoryRecord/save.json")
-    Observable<BaseMesBean> packageAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
+    Observable<BaseMesBean> packageAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
     /**
      * otherSupplierAdd
@@ -217,7 +219,7 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/msContractAndSettlement/save.json")
-    Observable<BaseMesBean> middleAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
+    Observable<BaseMesBean> middleAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
     /**
      * otherSupplierAdd
@@ -225,7 +227,7 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/msSceneFeedback/save.json")
-    Observable<BaseMesBean> userDataAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
+    Observable<BaseMesBean> userDataAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
     /**
      * otherSupplierAdd
@@ -235,5 +237,12 @@ public interface MesApiService {
     @POST("/himes/api/msSceneFeedback/show/getByFeedInfo.json")
     Observable<BaseMesBean> userDataDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+    /**
+     * 审核接口
+     *
+     * @return
+     */
+    @POST("/himes/api//msSceneFeedback/approval.json")
+    Observable<BaseMesBean> userDataCheck(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
 }

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

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -12,10 +13,10 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 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.AccountBean;
+import com.wd.workoffice.bean.event.AddUserDataEvent;
 import com.wd.workoffice.bean.mesBean.MchineDetailBean;
 import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -23,10 +24,13 @@ import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
 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.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
@@ -43,10 +47,9 @@ import io.reactivex.disposables.Disposable;
  * github: https://github.com/FlexibleXd
  **/
 public class MesUserDataDetailActivity extends WorkToolBarActivity {
-    RelativeLayout rlGoMiddle;
     @BindView(R.id.btn_refuse)
     Button btnRefuse;
-    @BindView(R.id.btn_reviews)
+    @BindView(R.id.btn_agree)
     Button btnReviews;
     @BindView(R.id.ll_bottom)
     LinearLayout llBottom;
@@ -162,9 +165,6 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        if (TextUtils.equals("1", getIntent().getStringExtra("from"))) {
-            llBottom.setVisibility(View.VISIBLE);
-        }
         rvData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
@@ -215,6 +215,20 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
                     tvClient.setText(mainInfo.getCustomerUserName());
                     tvManager.setText(mainInfo.getSalesManagerName());
                     tvSale.setText(mainInfo.getSalesCompanyName());
+                    if (TextUtils.equals("1", getIntent().getStringExtra("from"))) {
+                        if (mainInfo.getApprovalStatus() != 0) {
+                            llBottom.setVisibility(View.GONE);
+                        } else {
+                            llBottom.setVisibility(View.VISIBLE);
+                        }
+                    } else {
+                        if (mainInfo.getApprovalStatus() == 0) {
+                            llReason.setVisibility(View.VISIBLE);
+                            tvReason.setText(mainInfo.getRemark());
+                        } else {
+                            llBottom.setVisibility(View.GONE);
+                        }
+                    }
                 }
                 getMachineData(userDataDetailBean.getSteelInfo().getContinuousCasterCode());
             }
@@ -276,8 +290,6 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
                     tvProtection4.setText(mouldFlu.getSupplierName());
                 }
                 changeList();
-
-
             }
         });
     }
@@ -347,7 +359,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick({R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
+    @OnClick({R.id.btn_agree, R.id.btn_refuse, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_add1:
@@ -362,13 +374,70 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
             case R.id.rl_add:
                 startActivity(MesMiddleAddActivity.class);
                 break;
+            case R.id.btn_agree:
+                openCheck(1);
+                break;
+            case R.id.btn_refuse:
+                openCheck(2);
+                break;
         }
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
+    private void openCheck(int type) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        View view = LayoutInflater.from(this).inflate(R.layout.view_user_check, null);
+        TextView tvDesc = view.findViewById(R.id.tv_desc);
+        tvDesc.setText(type == 1 ? "通过" : "驳回原因");
+        TextView btnOk = view.findViewById(R.id.btn_ok);
+        EditText etContent = view.findViewById(R.id.et_content);
+        TextView tvClose = view.findViewById(R.id.tv_close);
+        builder.setView(view);
+        AlertDialog addCartDialog = builder.create();
+        btnOk.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                submitCheck(type, etContent.getText().toString());
+                addCartDialog.dismiss();
+            }
+        });
+        tvClose.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                addCartDialog.dismiss();
+            }
+        });
+        addCartDialog.show();
+    }
+
+    private void submitCheck(int type, String remark) {
+        Map<String, Object> param = WorkUtils.simpleParam();
+        param.put("id", getIntent().getStringExtra("id"));
+        param.put("approvalStatus", type == 1 ? 1 : 2);
+        param.put("isCustomerArchives", type == 1);
+        param.put("remark", remark);
+        RtfUtils.getMesRtf().userDataCheck("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.getMsg());
+                    return;
+                }
+                llBottom.setVisibility(View.GONE);
+                toast("提交成功");
+                EventBus.getDefault().post(new AddUserDataEvent());
+            }
+        });
     }
+
 }

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

@@ -12,6 +12,7 @@ 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.AddUserDataEvent;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
@@ -22,6 +23,9 @@ import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListTakeOnActivity;
 import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
 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;
@@ -58,7 +62,7 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        tvGo.setVisibility(View.GONE);
+        btnAdd.setVisibility(View.GONE);
         rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         tvGo.setText("任务担当\n" +
                 "页面");
@@ -130,7 +134,7 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesUserDataDetailActivity.class,"from","1","id",
+                startActivity(MesUserDataDetailActivity.class, "from", "1", "id",
                         dataList.get(position).getId());
             }
         });
@@ -171,4 +175,23 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
                 break;
         }
     }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(AddUserDataEvent event) {
+        page = 1;
+        param.put("pageNum", page);
+        getData();
+    }
 }

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

@@ -24,7 +24,7 @@
             android:textColor="@color/white" />
 
         <Button
-            android:id="@+id/btn_reviews"
+            android:id="@+id/btn_agree"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20mm"

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#d1f8f8f8"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20mm"
+        android:paddingHorizontal="20mm">
+
+        <TextView
+            android:id="@+id/tv_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:textSize="17sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tv_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:text="X"
+            android:textSize="22sp"
+            android:textStyle="bold" />
+    </RelativeLayout>
+
+    <EditText
+        android:id="@+id/et_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="20mm"
+        android:layout_marginTop="10mm"
+        android:background="@drawable/shape_input_white"
+        android:gravity="top"
+        android:hint="请输入原因"
+        android:minLines="4"
+        android:padding="5mm"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/btn_ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="7mm"
+        android:background="@drawable/shape_blue_circle"
+        android:paddingHorizontal="20mm"
+        android:text="通过"
+        android:textColor="@color/white" />
+
+</LinearLayout>