1.审批

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

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.wd.workoffice">
-
+    <uses-permission android:name="com.qdredsoft.ylh.permission.JPUSH_MESSAGE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+    <!-- Optional. Required for location feature -->
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- 用于开启 debug 版本的应用在 6.0 系统上的层叠窗口权限 -->
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <!--允许程序访问CellID或WiFi热点来获取粗略的位置-->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <application
         android:name=".app.WorkApp"
         android:allowBackup="true"

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddCrucibleConfirmActivity.java

@@ -333,7 +333,7 @@ public class AddCrucibleConfirmActivity extends WorkToolBarActivity {
             if (Matisse.obtainResult(data).size() != 0) {
                 showLoading();
                 File file = WorkUtils.uriToFile(Matisse.obtainResult(data).get(0), this);
-                RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
+                RequestBody requestFile = RequestBody.create(MediaType.parse("image/png"), file);
                 RtfHelper.getInstance().getApiService(ApiService.class).
                         upload(MultipartBody.Part.createFormData("newUploadImgs", file.getName(), requestFile)).
                         compose(Transformer.schedule()).subscribe(new WorkObserver<JSONObject>() {
@@ -358,6 +358,7 @@ public class AddCrucibleConfirmActivity extends WorkToolBarActivity {
                         toast("上传成功");
                         proList.get(choosePosition).setUrl(jsonObject.getString("data"));
                         coverProInfo(proList);
+                        proAdapter.notifyDataSetChanged();
                     }
                 });
             }

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleConfirmActivity.java

@@ -354,7 +354,7 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
             if (Matisse.obtainResult(data).size() != 0) {
                 showLoading();
                 File file = WorkUtils.uriToFile(Matisse.obtainResult(data).get(0), this);
-                RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
+                RequestBody requestFile = RequestBody.create(MediaType.parse("image/png"), file);
                 RtfHelper.getInstance().getApiService(ApiService.class).
                         upload(MultipartBody.Part.createFormData("newUploadImgs", file.getName(), requestFile)).
                         compose(Transformer.schedule()).subscribe(new WorkObserver<JSONObject>() {
@@ -372,13 +372,14 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
                     @Override
                     public void onSuccess(JSONObject jsonObject) {
                         hideLoading();
-                        if (jsonObject.getInteger("status") != 0) {
+                        if (jsonObject.getInteger("code") != 0) {
                             toast(jsonObject.getString("msg"));
                             return;
                         }
                         toast("上传成功");
                         proList.get(choosePosition).setUrl(jsonObject.getString("data"));
                         coverProInfo(proList);
+                        proAdapter.notifyDataSetChanged();
                     }
                 });
             }

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreTradingConfirmActivity.java

@@ -385,7 +385,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
             if (Matisse.obtainResult(data).size() != 0) {
                 showLoading();
                 File file = WorkUtils.uriToFile(Matisse.obtainResult(data).get(0), this);
-                RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), file);
+                RequestBody requestFile = RequestBody.create(MediaType.parse("image/png"), file);
                 RtfHelper.getInstance().getApiService(ApiService.class).
                         upload(MultipartBody.Part.createFormData("newUploadImgs", file.getName(), requestFile)).
                         compose(Transformer.schedule()).subscribe(new WorkObserver<JSONObject>() {
@@ -410,6 +410,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
                         toast("上传成功");
                         proList.get(choosePosition).setUrl(jsonObject.getString("data"));
                         coverProInfo(proList);
+                        proAdapter.notifyDataSetChanged();
                     }
                 });
             }

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

@@ -53,6 +53,9 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
             if (!TextUtils.isEmpty(item.getFactoryName())) {
                 helper.setText(R.id.tv_choose_dep, item.getFactoryName());
             }
+            if (!TextUtils.isEmpty(item.getUrl())){
+                helper.setText(R.id.tv_upload,"已上传，点击替换");
+            }
         } else if(type == 2){
             helper.addOnClickListener(R.id.tv_delete);
             AddAndReduceView num = helper.getView(R.id.ar_num);

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

@@ -38,6 +38,9 @@ public class TradingConfimProAdapter extends BaseQuickAdapter<ProductBean.Record
         helper.setText(R.id.tv_num, String.valueOf(item.getCarNum()));
         helper.setText(R.id.tv_all_price, MathUtils.multiply(item.getCarNum() + "", item.getInternalPrice() + "", 2));
         helper.addOnClickListener(R.id.rl_upload);
+        if (!TextUtils.isEmpty(item.getUrl())){
+            helper.setText(R.id.tv_upload, "已上传，点击替换");
+        }
     }
 }