1.添加供应列表

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.支数参数

app/src/main/AndroidManifest.xml

@@ -1752,6 +1752,23 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+
+        <activity
+            android:name=".ui.activity.mes.user.MesSupplierAddActivity"
+            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.user.MesSupplierModifyActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="修改供货记录"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/app/BaseMesBean.java

@@ -9,7 +9,7 @@ package com.wd.workoffice.app;
 public class BaseMesBean {
 
     private boolean success;
-    private String msg;
+    private String message;
     private String code;
     private Object status;
     private Object data;
@@ -30,12 +30,12 @@ public class BaseMesBean {
         this.success = success;
     }
 
-    public String getMsg() {
-        return msg;
+    public String getMessage() {
+        return message;
     }
 
-    public void setMsg(String message) {
-        this.msg = message;
+    public void setMessage(String message) {
+        this.message = message;
     }
 
     public String getCode() {

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

@@ -213,6 +213,17 @@ public interface MesApiService {
     @POST("/himes/api/msLadleRefractoryRecord/save.json")
     Observable<BaseMesBean> packageAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
+
+    /**
+     * otherSupplierAdd
+     *
+     * @return
+     */
+    @POST("/himes/api/msSupplyRecord/save.json")
+    Observable<BaseMesBean> supplierAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
+
+
+
     /**
      * otherSupplierAdd
      *

app/src/main/java/com/wd/workoffice/ui/activity/login/UserRegisterDepAddActivity.java

@@ -109,7 +109,7 @@ public class UserRegisterDepAddActivity extends WorkToolBarActivity {
 //            public void onSuccess(BaseBean data) {
 //                hideLoading();
 //                if (data.getCode() != 0) {
-//                    toast(data.getMsg());
+//                    toast(data.getMessage());
 //                    return;
 //                }
 //                EventBus.getDefault().post(new AddDepEvent());

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

@@ -75,7 +75,7 @@ public class MesAnalysisActivity extends WorkToolBarActivity {
 //            public void onSuccess(BaseMesBean data) {
 //                hideLoading();
 //                if (!data.isSuccess()) {
-//                    toast(data.getMsg());
+//                    toast(data.getMessage());
 //                    return;
 //                }
 //                List<SearchBean.ListBean> getList = JSON.parseObject(data.getData().toString(), SearchBean.class).getList();

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

 package com.wd.workoffice.ui.activity.mes.quality;
 
 import android.content.Intent;
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -11,20 +10,12 @@ 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.event.AddUserDataEvent;
 import com.wd.workoffice.bean.mesBean.BoxBean;
-import com.wd.workoffice.bean.mesBean.MesClientBean;
-import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.user.MesUserDataAdd2Activity;
 import com.wd.workoffice.ui.adapter.ChooseBoxAdapter;
-import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
 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;
@@ -91,7 +82,7 @@ public class MesChooseBoxActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<BoxBean> getList = JSON.parseArray(data.getData().toString(), BoxBean.class);

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

@@ -84,7 +84,7 @@ public class MesChooseDefectActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<DefectBean.ListBean> getList = JSON.parseObject(data.getData().toString(), DefectBean.class).getList();

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

@@ -2,8 +2,6 @@ package com.wd.workoffice.ui.activity.mes.quality;
 
 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;
@@ -11,11 +9,9 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.mesBean.ChooseMachineBean;
-import com.wd.workoffice.bean.mesBean.ManagerUserBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.MesChooseMachinerAdapter;
-import com.wd.workoffice.ui.adapter.MesManagerAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
@@ -26,7 +22,6 @@ 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;
 
@@ -79,7 +74,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<ChooseMachineBean> getList = JSON.parseArray(data.getData().toString(), ChooseMachineBean.class);

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

 package com.wd.workoffice.ui.activity.mes.quality;
 
 import android.content.Intent;
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -12,10 +11,8 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.mesBean.ManagerUserBean;
-import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.MesClientAdapter;
 import com.wd.workoffice.ui.adapter.MesManagerAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -84,7 +81,7 @@ public class MesChooseMangerActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<ManagerUserBean.ListBean> getList = JSON.parseObject(data.getData().toString(), ManagerUserBean.class).getList();

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

@@ -2,19 +2,15 @@ package com.wd.workoffice.ui.activity.mes.quality;
 
 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.BoxBean;
 import com.wd.workoffice.bean.mesBean.MesProcessBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.ChooseBoxAdapter;
 import com.wd.workoffice.ui.adapter.ChooseProcessAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -26,7 +22,6 @@ 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;
 
@@ -76,7 +71,7 @@ public class MesChooseProcessActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<MesProcessBean> getList = JSON.parseArray(data.getData().toString(), MesProcessBean.class);

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

@@ -10,11 +10,9 @@ 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.DefectBean;
 import com.wd.workoffice.bean.mesBean.QuestionBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.MesDefectAdapter;
 import com.wd.workoffice.ui.adapter.MesQuestionAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -86,7 +84,7 @@ public class MesChooseQuestionActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<QuestionBean.ListBean> getList = JSON.parseObject(data.getData().toString(), QuestionBean.class).getList();

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

@@ -6,7 +6,6 @@ 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;
@@ -20,7 +19,6 @@ import com.wd.workoffice.bean.event.CheckFeedbackEvent;
 import com.wd.workoffice.bean.mesBean.FeedbackBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketConditionActivity;
 import com.wd.workoffice.ui.adapter.MesQualityAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -93,7 +91,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<FeedbackBean.ListBean> getList;

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

@@ -16,7 +16,6 @@ import com.wd.workoffice.bean.event.CheckFeedbackEvent;
 import com.wd.workoffice.bean.mesBean.BoxBean;
 import com.wd.workoffice.bean.mesBean.ChooseMachineBean;
 import com.wd.workoffice.bean.mesBean.DefectBean;
-import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
@@ -25,8 +24,6 @@ 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.annotation.Nullable;
@@ -236,7 +233,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 EventBus.getDefault().post(new CheckFeedbackEvent());

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

 package com.wd.workoffice.ui.activity.mes.quality;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.EditText;
@@ -14,7 +13,6 @@ import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.event.CheckFeedbackEvent;
 import com.wd.workoffice.bean.mesBean.FeedbackDetailBean;
-import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.bean.mesBean.ManagerUserBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
@@ -22,8 +20,6 @@ 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.annotation.Nullable;
@@ -86,7 +82,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 EventBus.getDefault().post(new CheckFeedbackEvent());

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

 package com.wd.workoffice.ui.activity.mes.quality;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
@@ -10,7 +9,6 @@ import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.event.AddTicketEvent;
 import com.wd.workoffice.bean.event.CheckFeedbackEvent;
 import com.wd.workoffice.bean.mesBean.FeedbackDetailBean;
 import com.wd.workoffice.bean.mesBean.ImageBean;
@@ -146,7 +144,7 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 detailBean = JSON.parseObject(data.getData().toString(), FeedbackDetailBean.class);

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

 package com.wd.workoffice.ui.activity.mes.quality;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -14,13 +13,9 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.ProcessBean;
 import com.wd.workoffice.bean.event.CheckFeedbackEvent;
 import com.wd.workoffice.bean.mesBean.FeedbackDetailBean;
-import com.wd.workoffice.bean.mesBean.ImageBean;
-import com.wd.workoffice.bean.mesBean.MachineDetailBean;
 import com.wd.workoffice.bean.mesBean.ManagerUserBean;
-import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.bean.mesBean.MesProcessBean;
 import com.wd.workoffice.bean.mesBean.QuestionBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -31,9 +26,7 @@ import com.wd.workoffice.util.WorkUtils;
 import org.greenrobot.eventbus.EventBus;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 import androidx.annotation.Nullable;
@@ -121,7 +114,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 EventBus.getDefault().post(new CheckFeedbackEvent());

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

@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
-import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -19,11 +18,8 @@ import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.event.CheckFeedbackEvent;
 import com.wd.workoffice.bean.mesBean.FeedbackDetailBean;
 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.MesTicketAddSummaryActivity;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketConditionActivity;
 import com.wd.workoffice.ui.adapter.ImgAddAdapter;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.WorkUtils;
@@ -40,14 +36,12 @@ import java.util.Map;
 
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
 import flexible.xd.android_base.utils.FileUtils;
 import io.reactivex.disposables.Disposable;
-import me.rosuh.filepicker.config.FilePickerManager;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -116,7 +110,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 EventBus.getDefault().post(new CheckFeedbackEvent());
@@ -234,7 +228,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("上传成功");

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

@@ -99,7 +99,7 @@ public class MesReportActivity extends WorkBaseActivity {
 //            public void onSuccess(BaseMesBean data) {
 //                hideLoading();
 //                if (!data.isSuccess()) {
-//                    toast(data.getMsg());
+//                    toast(data.getMessage());
 //                    return;
 //                }
 //                List<SearchBean.ListBean> getList = JSON.parseObject(data.getData().toString(), SearchBean.class).getList();

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

@@ -15,12 +15,9 @@ import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.mesBean.SearchBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketConditionActivity;
 import com.wd.workoffice.ui.adapter.MesSearchAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -83,7 +80,7 @@ public class MesSearchActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<SearchBean.ListBean> getList = JSON.parseObject(data.getData().toString(), SearchBean.class).getList();

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

@@ -165,7 +165,7 @@ public class MesTicketAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<JobTypeBean> jobTypeList = JSON.parseArray(data.getData().toString(), JobTypeBean.class);
@@ -206,7 +206,7 @@ public class MesTicketAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<JobTypeBean> jobTypeList = JSON.parseArray(data.getData().toString(), JobTypeBean.class);
@@ -319,7 +319,7 @@ public class MesTicketAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 finish();

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

@@ -108,7 +108,7 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 finish();
@@ -249,7 +249,7 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("上传成功");

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

@@ -328,7 +328,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 finish();
@@ -417,7 +417,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("上传成功");

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

@@ -88,7 +88,7 @@ public class MesTicketClientActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<MesClientBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesClientBean.class).getList();

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

@@ -9,7 +9,6 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 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;
@@ -145,7 +144,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<JobTypeBean> jobTypeList = JSON.parseArray(data.getData().toString(), JobTypeBean.class);
@@ -211,7 +210,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("接收成功");

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

@@ -190,7 +190,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("评价成功");
@@ -217,7 +217,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 dataBean = JSON.parseObject(data.getData().toString(), SummaryBean.class);

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

@@ -158,7 +158,7 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 dataBean = JSON.parseObject(data.getData().toString(), SummaryBean.class);
@@ -181,7 +181,7 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 ReviewBean dataBean = JSON.parseObject(data.getData().toString(), ReviewBean.class);

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

@@ -93,7 +93,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<TicketBean.ListBean> getList = JSON.parseObject(data.getData().toString(), TicketBean.class).getList();

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

@@ -95,7 +95,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<TicketBean.ListBean> getList = JSON.parseObject(data.getData().toString(), TicketBean.class).getList();

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

@@ -76,7 +76,7 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<LogBean> getList = JSON.parseArray(data.getData().toString(), LogBean.class);

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

@@ -81,7 +81,7 @@ public class MesTicketProActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<MesProBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesProBean.class).getList();

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

@@ -81,7 +81,7 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<TakeOnBean.ListBean> getList = JSON.parseObject(data.getData().toString(), TakeOnBean.class).getList();

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

@@ -9,17 +9,13 @@ 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.BaseBean;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.ClientBean;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
 import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
-import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.StoreClientAdapter;
 import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -36,7 +32,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
-import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -90,7 +85,7 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<MesClientBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesClientBean.class).getList();

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

@@ -11,19 +11,14 @@ 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.BaseBean;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.ClientBean;
-import com.wd.workoffice.bean.event.AddDepEvent;
 import com.wd.workoffice.bean.event.AddFactoryEvent;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
 import com.wd.workoffice.bean.mesBean.FactoryBean;
-import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
 import com.wd.workoffice.ui.adapter.UserDataFactorytAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -40,7 +35,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
-import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -99,7 +93,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<FactoryBean> getList = JSON.parseArray(data.getData().toString(), FactoryBean.class);

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

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -17,7 +16,6 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.event.AddFactoryEvent;
-import com.wd.workoffice.bean.event.AddMachineEvent;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
 import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
@@ -216,7 +214,7 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("添加成功");

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

@@ -11,20 +11,15 @@ 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.BaseBean;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.ClientBean;
-import com.wd.workoffice.bean.event.AddFactoryEvent;
 import com.wd.workoffice.bean.event.AddMachineEvent;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
-import com.wd.workoffice.bean.mesBean.FactoryBean;
 import com.wd.workoffice.bean.mesBean.MachineBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.UserDataChooseMachineAdapter;
-import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -40,7 +35,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
-import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -98,7 +92,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<MachineBean> getList = JSON.parseArray(data.getData().toString(), MachineBean.class);

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.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;
@@ -21,12 +20,9 @@ import com.wd.workoffice.bean.event.AddMachineAddChildEvent;
 import com.wd.workoffice.bean.event.AddMachineEvent;
 import com.wd.workoffice.bean.event.AddMachineModifyChildEvent;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
-import com.wd.workoffice.bean.mesBean.FactoryBean;
-import com.wd.workoffice.bean.mesBean.MachineBean;
 import com.wd.workoffice.bean.mesBean.MachineDetailBean;
 import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
-import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
@@ -202,8 +198,11 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
         data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesSupplierActivity.class,
+//                startActivity(MesSupplierActivity.class,
+//                        "position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
+                startActivity(MesSupplierModifyActivity.class,
                         "position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
+
             }
         });
         data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@@ -338,7 +337,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
         }
     }
 
-    @OnClick({R.id.rl_cover4,R.id.rl_protection4,R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
+    @OnClick({R.id.tv_add2,R.id.rl_cover4,R.id.rl_protection4,R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, 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.rl_cover4:
@@ -353,6 +352,10 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
                 startActivity(MesThreeAddActivity.class,
                         "from", "1", "continuousCasterCode", data.getContinuousCasterCode());
                 break;
+            case R.id.tv_add2:
+                startActivity(MesSupplierAddActivity.class,
+                        "from", "1", "continuousCasterCode", data.getContinuousCasterCode());
+                break;
             case R.id.tv_add3:
                 startActivity(MesOtherSupplierAddActivity.class,
                         "from", "1", "continuousCasterCode", data.getContinuousCasterCode());
@@ -420,6 +423,12 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
                 machineDetailBean.getProductList().add(JSON.parseObject(event.getData(), MachineDetailBean.ProductListBean.class));
                 break;
             case 2:
+                List<MachineDetailBean.SupplyListBean> supplierList = machineDetailBean.getSupplyList();
+                if (supplierList == null) {
+                    machineDetailBean.setSupplyList(new ArrayList<>());
+                }
+                machineDetailBean.getSupplyList().add(JSON.parseObject(event.getData(), MachineDetailBean.SupplyListBean.class));
+
                 break;
             case 3:
                 List<MachineDetailBean.OtherSupListBean> supplyList = machineDetailBean.getOtherSupList();
@@ -465,6 +474,12 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
                 productList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.ProductListBean.class));
                 break;
             case 2:
+                List<MachineDetailBean.SupplyListBean> supplierList = machineDetailBean.getSupplyList();
+                if (supplierList == null) {
+                    machineDetailBean.setSupplyList(new ArrayList<>());
+                }
+                supplierList.remove(event.getPosition());
+                supplierList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.SupplyListBean.class));
                 break;
             case 3:
                 List<MachineDetailBean.OtherSupListBean> supplyList = machineDetailBean.getOtherSupList();
@@ -558,7 +573,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("添加成功");
@@ -586,7 +601,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("添加成功");

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

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -191,7 +190,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
@@ -288,7 +287,9 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
         data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesSupplierActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
+//                startActivity(MesSupplierActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
+                startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
+
             }
         });
         data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@@ -324,12 +325,15 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick({R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
+    @OnClick({R.id.tv_add2,R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, 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:
                 startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
                 break;
+            case R.id.tv_add2:
+                startActivity(MesSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
+                break;
             case R.id.tv_add3:
                 startActivity(MesOtherSupplierAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
                 break;
@@ -429,7 +433,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("添加成功");

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

@@ -106,7 +106,7 @@ public class MesMiddleAddActivity extends WorkToolBarActivity {
                 public void onSuccess(BaseMesBean data) {
                     hideLoading();
                     if (!data.isSuccess()) {
-                        toast(data.getMsg());
+                        toast(data.getMessage());
                         return;
                     }
                     finish();

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

@@ -114,7 +114,7 @@ public class MesMiddleModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 finish();

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

@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -20,10 +19,8 @@ import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.event.AddMachineAddChildEvent;
 import com.wd.workoffice.bean.event.RefreshMachineEvent;
 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.util.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
 import com.wd.workoffice.util.WorkUtils;
@@ -123,7 +120,7 @@ public class MesOtherSupplierAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 finish();
@@ -260,7 +257,7 @@ public class MesOtherSupplierAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("上传成功");

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

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.os.Bundle;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -88,7 +87,7 @@ public class MesOtherSupplierDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
 

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

@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -21,10 +20,8 @@ import com.wd.workoffice.bean.event.AddMachineModifyChildEvent;
 import com.wd.workoffice.bean.event.RefreshMachineEvent;
 import com.wd.workoffice.bean.mesBean.ImageBean;
 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.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
 import com.wd.workoffice.util.WorkUtils;
@@ -135,7 +132,7 @@ public class MesOtherSupplierModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 dataBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.OtherSupListBean.class);
@@ -194,7 +191,7 @@ public class MesOtherSupplierModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 finish();
@@ -331,7 +328,7 @@ public class MesOtherSupplierModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("上传成功");

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

@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -135,7 +134,7 @@ public class MesPackageAddActivity extends WorkToolBarActivity {
                 public void onSuccess(BaseMesBean data) {
                     hideLoading();
                     if (!data.isSuccess()) {
-                        toast(data.getMsg());
+                        toast(data.getMessage());
                         return;
                     }
                     finish();
@@ -282,7 +281,7 @@ public class MesPackageAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("上传成功");

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

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.os.Bundle;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -93,7 +92,7 @@ public class MesPackageDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
 

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

@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -148,7 +147,7 @@ public class MesPackageModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 dataBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.OtherLadleListBean.class);
@@ -213,7 +212,7 @@ public class MesPackageModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 finish();
@@ -359,7 +358,7 @@ public class MesPackageModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("上传成功");

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesStockAddActivity.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;
@@ -120,7 +119,7 @@ public class MesStockAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 finish();

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesStockModifyActivity.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;
@@ -138,7 +137,7 @@ public class MesStockModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 finish();

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

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.os.Bundle;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
-import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.AccountBean;
 import com.wd.workoffice.bean.mesBean.MachineDetailBean;
-import com.wd.workoffice.retrofit.RtfUtils;
-import com.wd.workoffice.retrofit.WorkObserver;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import flexible.xd.android_base.network.rtfhttp.Transformer;
 import flexible.xd.android_base.utils.TimeUtils;
-import io.reactivex.disposables.Disposable;
 
 /**
  * 用户数据采集，三大件供货记录
@@ -35,7 +28,6 @@ public class MesSupplierActivity extends WorkToolBarActivity {
     TextView tvSendTime;
     @BindView(R.id.tv_send_num)
     TextView tvSendNum;
-    private AccountBean dataBean;
     private MachineDetailBean.SupplyListBean data;
 
     @Override
@@ -50,7 +42,7 @@ public class MesSupplierActivity extends WorkToolBarActivity {
         tvImgCode.setText(data.getFigureNumber ());
         tvName.setText(data.getProductsName());
         tvSendNum.setText(data.getDeliveryNumber());
-        tvSendTime.setText(TimeUtils.millis2String(data.getDeliveryDateTime()));
+        tvSendTime.setText(TimeUtils.millis2String(data.getDeliveryDateTime()/1000));
     }
 
 
@@ -60,7 +52,7 @@ public class MesSupplierActivity extends WorkToolBarActivity {
 
     @Override
     protected int layoutId() {
-        return R.layout.activity_mes_user_data_supplier;
+        return R.layout.activity_mes_user_data_supplier_detail;
     }
 
 }

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

+package com.wd.workoffice.ui.activity.mes.user;
+
+import android.content.Intent;
+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;
+
+import com.alibaba.fastjson.JSON;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.AddMachineAddChildEvent;
+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.PickTimeUtils;
+import com.wd.workoffice.util.WorkUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+import androidx.annotation.Nullable;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import flexible.xd.android_base.utils.TimeUtils;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesSupplierAddActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_code)
+    TextView tvCode;
+    @BindView(R.id.rl_pro_code)
+    RelativeLayout rlProCode;
+    @BindView(R.id.tv_name)
+    TextView tvName;
+    @BindView(R.id.tv_img_code)
+    TextView tvImgCode;
+    @BindView(R.id.tv_send_time)
+    TextView tvSendTime;
+    @BindView(R.id.rl_time)
+    RelativeLayout rlTime;
+    @BindView(R.id.tv_send_num)
+    EditText tvSendNum;
+    private Map<String, Object> param;
+    private MesProBean.ListBean choosePro;
+    private String from;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+        from = getIntent().getStringExtra("from");
+        param = WorkUtils.simpleParam();
+        param.put("continuousCasterCode", getIntent().getStringExtra("continuousCasterCode"));
+    }
+
+    private void submit() {
+        String num = tvSendNum.getText().toString();
+        if (choosePro == null) {
+            toast("请选择产品");
+            return;
+        }
+        param.put("deliveryNumber", num);
+        if (TextUtils.equals(from, "1")) {
+            EventBus.getDefault().post(new AddMachineAddChildEvent(2, JSON.toJSONString(param)));
+            finish();
+        } else {
+            RtfUtils.getMesRtf().supplierAdd("1", "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;
+                    }
+                    finish();
+                    toast("添加成功");
+                    EventBus.getDefault().post(new RefreshMachineEvent());
+                }
+            });
+        }
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_user_data_supplier;
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_finish, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.finish:
+                submit();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 10001 && resultCode == 10001) {
+            choosePro = JSON.parseObject(data.getStringExtra("data"), MesProBean.ListBean.class);
+            tvCode.setText(choosePro.getProductCode());
+            tvName.setText(choosePro.getProductName());
+            tvImgCode.setText(choosePro.getDrawingNumber());
+            param.put("productsCode", choosePro.getProductCode());
+            param.put("productsName", choosePro.getProductName());
+            param.put("figureNumber", choosePro.getDrawingNumber());
+
+        }
+    }
+
+    @OnClick({R.id.rl_pro_code, R.id.rl_time})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.rl_pro_code:
+                startActivityForResult(MesTicketProActivity.class, 10001
+                        , "from", "1");
+                break;
+            case R.id.rl_time:
+                PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
+                    @Override
+                    public void onTimeSelect(Date date, View v) {
+                        tvSendTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
+                        param.put("deliveryDateTime", TimeUtils.date2Millis(date) / 1000);
+                    }
+                }).show();
+                break;
+        }
+    }
+}

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.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;
+
+import com.alibaba.fastjson.JSON;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.AddMachineModifyChildEvent;
+import com.wd.workoffice.bean.event.RefreshMachineEvent;
+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.PickTimeUtils;
+import com.wd.workoffice.util.WorkUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+import androidx.annotation.Nullable;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import flexible.xd.android_base.utils.TimeUtils;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesSupplierModifyActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_code)
+    TextView tvCode;
+    @BindView(R.id.rl_pro_code)
+    RelativeLayout rlProCode;
+    @BindView(R.id.tv_name)
+    TextView tvName;
+    @BindView(R.id.tv_img_code)
+    TextView tvImgCode;
+    @BindView(R.id.tv_send_time)
+    TextView tvSendTime;
+    @BindView(R.id.rl_time)
+    RelativeLayout rlTime;
+    @BindView(R.id.tv_send_num)
+    EditText tvSendNum;
+    private Map<String, Object> param;
+    private MesProBean.ListBean choosePro;
+    private String from;
+    private MachineDetailBean.SupplyListBean dataBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+        from = getIntent().getStringExtra("from");
+        dataBean = JSON.parseObject(getIntent().getStringExtra("data"), MachineDetailBean.SupplyListBean.class);
+        param = WorkUtils.simpleParam();
+        param.put("continuousCasterCode", dataBean.getContinuousCasterCode());
+        param.put("id", dataBean.getId());
+        if (!TextUtils.isEmpty(dataBean.getProductsCode())) {
+            choosePro = new MesProBean.ListBean();
+            choosePro.setDrawingNumber(dataBean.getFigureNumber());
+            choosePro.setProductName(dataBean.getProductsName());
+            choosePro.setProductCode(dataBean.getProductsCode());
+            tvCode.setText(choosePro.getProductCode());
+            tvName.setText(choosePro.getProductName());
+            tvImgCode.setText(choosePro.getDrawingNumber());
+        }
+        tvSendNum.setText(dataBean.getDeliveryNumber());
+        tvSendTime.setText(TimeUtils.millis2String(dataBean.getDeliveryDateTime() / 1000));
+    }
+
+    private void submit() {
+        String num = tvSendNum.getText().toString();
+        if (choosePro == null) {
+            toast("请选择产品");
+            return;
+        }
+        param.put("deliveryNumber", num);
+        if (TextUtils.equals(from, "1")) {
+            EventBus.getDefault().post(new AddMachineModifyChildEvent(2, JSON.toJSONString(param)
+                    , Integer.valueOf(getIntent().getStringExtra("position"))));
+            finish();
+            return;
+        }
+        RtfUtils.getMesRtf().supplierAdd("1", "2", 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;
+                }
+                finish();
+                toast("编辑成功");
+                EventBus.getDefault().post(new RefreshMachineEvent());
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_user_data_supplier;
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_finish, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.finish:
+                submit();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 10001 && resultCode == 10001) {
+            choosePro = JSON.parseObject(data.getStringExtra("data"), MesProBean.ListBean.class);
+            tvCode.setText(choosePro.getProductCode());
+            tvName.setText(choosePro.getProductName());
+            tvImgCode.setText(choosePro.getDrawingNumber());
+            param.put("productsCode", choosePro.getProductCode());
+            param.put("productsName", choosePro.getProductName());
+            param.put("figureNumber", choosePro.getDrawingNumber());
+
+        }
+    }
+
+    @OnClick({R.id.rl_pro_code, R.id.rl_time})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.rl_pro_code:
+                startActivityForResult(MesTicketProActivity.class, 10001
+                        , "from", "1");
+                break;
+            case R.id.rl_time:
+                PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
+                    @Override
+                    public void onTimeSelect(Date date, View v) {
+                        tvSendTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
+                        param.put("deliveryDateTime", TimeUtils.date2Millis(date) / 1000);
+                    }
+                }).show();
+                break;
+        }
+    }
+}

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

@@ -15,7 +15,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.bigkoo.pickerview.listener.OnTimeSelectListener;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
@@ -29,7 +28,6 @@ import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
-import com.wd.workoffice.util.PickTimeUtils;
 import com.wd.workoffice.util.WorkUtils;
 import com.zhihu.matisse.Matisse;
 import com.zhihu.matisse.MimeType;
@@ -39,7 +37,6 @@ import org.greenrobot.eventbus.EventBus;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -165,7 +162,7 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
                 public void onSuccess(BaseMesBean data) {
                     hideLoading();
                     if (!data.isSuccess()) {
-                        toast(data.getMsg());
+                        toast(data.getMessage());
                         return;
                     }
                     finish();
@@ -317,7 +314,7 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("上传成功");

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

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.os.Bundle;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -107,7 +106,7 @@ public class MesThreeDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
 

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

@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -15,7 +14,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.bigkoo.pickerview.listener.OnTimeSelectListener;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
@@ -30,7 +28,6 @@ import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketProActivity;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
-import com.wd.workoffice.util.PickTimeUtils;
 import com.wd.workoffice.util.WorkUtils;
 import com.zhihu.matisse.Matisse;
 import com.zhihu.matisse.MimeType;
@@ -40,7 +37,6 @@ import org.greenrobot.eventbus.EventBus;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -174,7 +170,7 @@ public class MesThreeModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 dataBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.ProductListBean.class);
@@ -251,7 +247,7 @@ public class MesThreeModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 finish();
@@ -401,7 +397,7 @@ public class MesThreeModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 toast("上传成功");

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

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -28,7 +24,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
@@ -111,7 +106,7 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 FactoryDetailBean factoryDetailBean = JSON.parseObject(data.getData().toString(), FactoryDetailBean.class);

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

@@ -17,18 +17,14 @@ 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.AccountBean;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
 import com.wd.workoffice.bean.event.ModifyUserDataEvent;
-import com.wd.workoffice.bean.event.RefreshMachineEvent;
 import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
 import com.wd.workoffice.bean.mesBean.MachineDetailBean;
 import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.UserDataAdd3Adapter;
 import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter;
-import com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter;
 import com.wd.workoffice.ui.adapter.UserDataDetailFactory1Adapter;
 import com.wd.workoffice.ui.adapter.UserDataDetailFactory2Adapter;
 import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
@@ -270,7 +266,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 userDataDetailBean = JSON.parseObject(data.getData().toString(), UserDataDetailBean.class);
@@ -318,7 +314,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 FactoryDetailBean factoryDetailBean = JSON.parseObject(data.getData().toString(), FactoryDetailBean.class);
@@ -366,7 +362,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
@@ -508,6 +504,13 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
                 }
                 startActivity(MesThreeAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
                 break;
+            case R.id.tv_add2:
+                if (userDataDetailBean == null) {
+                    toast("数据加载中，请稍后");
+                    return;
+                }
+                startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
+                break;
             case R.id.tv_add3:
                 if (userDataDetailBean == null) {
                     toast("数据加载中，请稍后");
@@ -595,7 +598,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 llBottom.setVisibility(View.GONE);

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

 package com.wd.workoffice.ui.activity.mes.user;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -270,7 +269,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 userDataDetailBean = JSON.parseObject(data.getData().toString(), UserDataDetailBean.class);
@@ -309,7 +308,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 factoryDetailBean = JSON.parseObject(data.getData().toString(), FactoryDetailBean.class);
@@ -357,7 +356,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
@@ -454,7 +453,8 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
         data2Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesSupplierActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
+//                startActivity(MesSupplierActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
+                startActivity(MesSupplierModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSupplyList().get(position)));
             }
         });
         data3Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@@ -531,6 +531,13 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
                 }
                 startActivity(MesThreeAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
                 break;
+            case R.id.tv_add2:
+                if (userDataDetailBean == null) {
+                    toast("数据加载中，请稍后");
+                    return;
+                }
+                startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
+                break;
             case R.id.tv_add3:
                 if (userDataDetailBean == null) {
                     toast("数据加载中，请稍后");
@@ -709,7 +716,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 if (canFinish) {
@@ -759,7 +766,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 if (canFinish) {

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.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;
 import android.view.View;
@@ -15,19 +13,12 @@ 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.AddTicketEvent;
 import com.wd.workoffice.bean.event.AddUserDataEvent;
-import com.wd.workoffice.bean.listener.FiveMenuClickListener;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketAddActivity;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketConditionActivity;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListTakeOnActivity;
 import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
 import com.wd.workoffice.util.WorkUtils;
-import com.wd.workoffice.util.ddmfilter.MesUserDataListFilterData;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -102,7 +93,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<UserDataBean.ListBean> getList = JSON.parseObject(data.getData().toString(), UserDataBean.class).getList();

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

@@ -17,10 +17,6 @@ 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;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketAddActivity;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketDetailFinishActivity;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListTakeOnActivity;
 import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -98,7 +94,7 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMsg());
+                    toast(data.getMessage());
                     return;
                 }
                 List<UserDataBean.ListBean> getList = JSON.parseObject(data.getData().toString(), UserDataBean.class).getList();

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

@@ -168,7 +168,7 @@ public class MsgListFragment extends WorkBaseFg {
             public void onSuccess(BaseBean data) {
                 hideLoading();
                 if (data.getCode() != 0) {
-//                    toast(data.getMsg());
+//                    toast(data.getMessage());
                     return;
                 }
             }

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

@@ -1058,13 +1058,26 @@
                     android:layout_alignParentLeft="true"
                     android:text="供货记录"
                     android:textSize="15sp" />
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:gravity="right"
+                    android:orientation="vertical">
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_data2"
-                    android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <TextView
+                        android:id="@+id/tv_add2"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_gravity="right" />
+                        android:gravity="right"
+                        android:text="添加 +"
+                        android:textSize="16sp" />
+                </LinearLayout>
 
             </RelativeLayout>
 

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

@@ -1061,13 +1061,26 @@
                     android:layout_alignParentLeft="true"
                     android:text="供货记录"
                     android:textSize="15sp" />
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:gravity="right"
+                    android:orientation="vertical">
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_data2"
-                    android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                    <TextView
+                        android:id="@+id/tv_add2"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_gravity="right" />
+                        android:gravity="right"
+                        android:text="添加 +"
+                        android:textSize="16sp" />
+                </LinearLayout>
 
             </RelativeLayout>
 

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

@@ -727,14 +727,26 @@
                 android:layout_alignParentLeft="true"
                 android:text="供货记录"
                 android:textSize="15sp" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_data2"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_gravity="right" />
+                android:gravity="right"
+                android:orientation="vertical">
 
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_data2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/tv_add2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:text="添加 +"
+                    android:textSize="16sp" />
+            </LinearLayout>
         </RelativeLayout>
 
 

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

@@ -690,14 +690,26 @@
                 android:layout_alignParentLeft="true"
                 android:text="供货记录"
                 android:textSize="15sp" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_data2"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_gravity="right" />
+                android:gravity="right"
+                android:orientation="vertical">
 
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_data2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/tv_add2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:text="添加 +"
+                    android:textSize="16sp" />
+            </LinearLayout>
         </RelativeLayout>
 
 

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

 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView 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">
 
@@ -8,10 +9,11 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-
         <RelativeLayout
+            android:id="@+id/rl_pro_code"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="10mm"
             android:background="@android:color/white"
             android:paddingHorizontal="20mm"
             android:paddingVertical="9mm">
@@ -23,15 +25,27 @@
                 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_code"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                    android:layout_alignParentLeft="true"
                     android:layout_marginRight="3mm"
-                android:text="XD234"
+                    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" />
@@ -57,7 +71,6 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
-                android:text="XD234"
                 android:textSize="14sp" />
         </RelativeLayout>
 
@@ -84,13 +97,13 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
-                android:text="XD234"
                 android:textSize="14sp" />
         </RelativeLayout>
 
         <View style="@style/dividerX" />
 
         <RelativeLayout
+            android:id="@+id/rl_time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -111,7 +124,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
-                android:text="XD234"
+                android:text="请选择"
                 android:textSize="14sp" />
         </RelativeLayout>
 
@@ -132,13 +145,14 @@
                 android:textSize="14sp" />
 
 
-            <TextView
+            <EditText
                 android:id="@+id/tv_send_num"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
-                android:text="XD234"
+                android:hint="请输入"
+                android:background="@null"
                 android:textSize="14sp" />
         </RelativeLayout>
 

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="产品编码"
+                android:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/tv_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:text="XD234"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="产品名称"
+                android:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:text="XD234"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="图号"
+                android:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/tv_img_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:text="XD234"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="发货时间"
+                android:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/tv_send_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:text="XD234"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="发货数量"
+                android:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/tv_send_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:text="XD234"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file