1.用户反馈 新增

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

app/src/main/AndroidManifest.xml

@@ -1254,11 +1254,11 @@
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".ui.activity.mes.ticket.MesTicketLogActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="工作日志"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
-            android:configChanges="orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".ui.activity.mes.ticket.MesTicketAddLogActivity"
@@ -1477,6 +1477,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.user.MesMiddleAddActivity"
+            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.search.MesSearchActivity"

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

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

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

@@ -211,4 +211,21 @@ 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/msContractAndSettlement/save.json")
+    Observable<BaseMesBean> middleAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
+
+    /**
+     * otherSupplierAdd
+     *
+     * @return
+     */
+    @POST("/himes/api/msSceneFeedback/save.json")
+    Observable<BaseMesBean> userDataAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
+
+
 }

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

@@ -13,6 +13,7 @@ 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;
@@ -22,6 +23,9 @@ import com.wd.workoffice.ui.adapter.StoreClientAdapter;
 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;
@@ -148,4 +152,21 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
         page = 1;
         getData();
     }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(AddUserDataEvent event) {
+        finish();
+    }
 }

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

@@ -17,6 +17,7 @@ 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;
@@ -168,4 +169,9 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
     @Subscribe
     public void refresh(AddFactoryEvent event) {
     }
+
+    @Subscribe
+    public void finish(AddUserDataEvent event) {
+        finish();
+    }
 }

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

@@ -15,6 +15,7 @@ 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.AddUserDataEvent;
 import com.wd.workoffice.bean.mesBean.FactoryBean;
 import com.wd.workoffice.bean.mesBean.MachineBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
@@ -159,4 +160,10 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
     @Subscribe
     public void refresh(AddFactoryEvent event) {
     }
+
+
+    @Subscribe
+    public void finish(AddUserDataEvent event) {
+        finish();
+    }
 }

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;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -12,7 +14,9 @@ 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.event.RefreshMachineEvent;
+import com.wd.workoffice.bean.mesBean.MachineBean;
 import com.wd.workoffice.bean.mesBean.MchineDetailBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -35,6 +39,8 @@ import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
 import flexible.xd.android_base.utils.TimeUtils;
 import io.reactivex.disposables.Disposable;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 
 /**
  * 用户数据采集，连铸机详情
@@ -288,7 +294,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
                 startActivity(MesPackageAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
                 break;
             case R.id.rl_add:
-                startActivity(MesMiddleAddActivity.class, "data", JSON.toJSONString(data));
+                startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
                 break;
             case R.id.rl_middle:
                 if (llMiddle.getVisibility() == View.VISIBLE) {
@@ -330,4 +336,48 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
     public void refresh(RefreshMachineEvent event) {
         getData();
     }
+
+
+    @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);
+    }
+
+    private void submit() {
+        data.setSteelmakingInfoCode("steelmakingInfoCode");
+        RtfUtils.getMesRtf().userDataAdd("1", "1", RequestBody.create(MediaType.parse("application/json; charset=utf-8"), JSON.toJSONString(data))).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMsg());
+                    return;
+                }
+                toast("添加成功");
+                EventBus.getDefault().post(new AddUserDataEvent());
+                finish();
+            }
+        });
+    }
 }

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

 package com.wd.workoffice.ui.activity.mes.user;
 
+import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.EditText;
 
+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.AddFactoryEvent;
+import com.wd.workoffice.bean.mesBean.MchineDetailBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import java.util.Map;
+
+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;
 
 /**
  * author : flexible
@@ -20,6 +35,13 @@ import butterknife.ButterKnife;
 public class MesMiddleAddActivity extends WorkToolBarActivity {
 
 
+    @BindView(R.id.et_middle_status)
+    EditText etMiddleStatus;
+    @BindView(R.id.et_three_status)
+    EditText etThreeStatus;
+    @BindView(R.id.et_type)
+    EditText etType;
+    private Map<String, Object> param;
     @Override
     protected void initView() {
         ButterKnife.bind(this);
@@ -27,6 +49,8 @@ public class MesMiddleAddActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        param = WorkUtils.simpleParam();
+        param.put("continuousCasterCode", getIntent().getStringExtra("continuousCasterCode"));
     }
 
 
@@ -36,7 +60,7 @@ public class MesMiddleAddActivity extends WorkToolBarActivity {
 
     @Override
     protected int layoutId() {
-        return R.layout.activity_mes_user_data_other_supplier;
+        return R.layout.activity_mes_user_data_other_middle;
     }
 
 
@@ -50,26 +74,42 @@ public class MesMiddleAddActivity extends WorkToolBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.finish:
-                finish();
+                submit();
                 break;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        EventBus.getDefault().unregister(this);
+    private void submit() {
+        String middleStatus = etMiddleStatus.getText().toString();
+        String threeStatus = etThreeStatus.getText().toString();
+        String type = etType.getText().toString();
+        param.put("ladleContractSituation", middleStatus);
+        param.put("continuousCastingContractSituation", threeStatus);
+        param.put("settlementMethod", type);
+        RtfUtils.getMesRtf().middleAdd("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.getMsg());
+                    return;
+                }
+                finish();
+                toast("添加成功");
+            }
+        });
     }
 
-    @Subscribe
-    public void refresh(AddFactoryEvent event) {
-    }
 
 }

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

@@ -12,10 +12,14 @@ 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.event.AddUserDataEvent;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -131,5 +135,20 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity {
 //        startActivityForResult(MesChooseFactoryActivity.class, 10001);
         startActivity(MesChooseFactoryActivity.class, "data", JSON.toJSONString(data));
     }
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
 
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(AddUserDataEvent event) {
+        finish();
+    }
 }

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

@@ -11,6 +11,7 @@ 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.AddUserDataEvent;
 import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
 import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -20,6 +21,9 @@ import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter;
 import com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter;
 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;
@@ -175,5 +179,20 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
     public void onViewClicked() {
         startActivity(MesChooseMachineActivity.class,"data",JSON.toJSONString(data));
     }
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
 
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(AddUserDataEvent event) {
+        finish();
+    }
 }

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

@@ -12,9 +12,13 @@ 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.event.AddUserDataEvent;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -76,13 +80,21 @@ public class MesUserDataAddActivity extends WorkToolBarActivity {
         startActivity(MesChooseClientActivity.class);
     }
 
+
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 10001 && resultCode == 10001) {
-            String clientName = data.getStringExtra("clientName");
-//            clientId = data.getIntExtra("id", 0);
-//            tvClient.setText(clientName);
-        }
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(AddUserDataEvent event) {
+        finish();
     }
 }

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

@@ -14,6 +14,8 @@ 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;
@@ -25,6 +27,9 @@ 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;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -171,4 +176,23 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
                 break;
         }
     }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(AddUserDataEvent event) {
+        page = 1;
+        param.put("pageNum", page);
+        getData();
+    }
 }

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

@@ -25,6 +25,7 @@
 
 
             <EditText
+                android:id="@+id/et_middle_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -51,6 +52,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_three_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -77,6 +79,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"