1.修改bug

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

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

 package com.wd.workoffice.ui.activity.bat.order;
 
-import android.text.Editable;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
@@ -21,6 +19,7 @@ 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.SendApplyDetailAdapter;
+import com.wd.workoffice.util.MathUtils;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -41,7 +40,7 @@ import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
- * 收活详情
+ * 申请发货详情
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -109,8 +108,8 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
         info = JSON.parseObject(getIntent().getStringExtra("info"), SendApplyBean.RecordsBean.class);
         getData(info.getId() + "");
         tvTime.setText(info.getCreatedTime());
-        tvWeight.setText(String.valueOf(info.getTotalWeight()));
-        tvLogisticsPrice.setText(String.valueOf(info.getFareMoney()));
+        tvWeight.setText(MathUtils.converData(info.getTotalWeight(),3));
+        tvLogisticsPrice.setText(MathUtils.converData(info.getFareMoney(),3));
         tvLogisticsCode.setText(info.getTrackingNumber());
         tvLogisticsCompany.setText(info.getTransitPartName());
         tvRemark.setText(info.getApplyRemark());
@@ -135,7 +134,6 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
     private void getData(String id) {
         RtfUtils.getRtf().sendApplyDetail(id).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
 
-
             @Override
             public void doOnSubscribe(Disposable d) {
             }

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

@@ -11,6 +11,7 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.bean.LogisticDetailBean;
 import com.wd.workoffice.bean.OrderDetail;
 import com.wd.workoffice.bean.event.SendWeightEvent;
+import com.wd.workoffice.util.MathUtils;
 import com.wd.workoffice.util.WorkUtils;
 import com.wd.workoffice.widget.AddAndReduceDoubleView;
 import com.wd.workoffice.widget.AddAndReduceView;
@@ -43,15 +44,15 @@ public class WorkSendApplyAddAdapter extends BaseQuickAdapter<OrderDetail.OrderI
         helper.setText(R.id.tv_card, item.getProductSoleCode());
         helper.setText(R.id.tv_card_name, item.getProductName ());
         helper.setText(R.id.tv_spec, item.getProductSpec());
-        helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
+        helper.setText(R.id.tv_price, "￥".concat(MathUtils.converData(item.getInnerPrice(),3)));
 //        helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
         helper.setText(R.id.tv_unit, item.getProductUnit());
 //        helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
-        helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
-        helper.setText(R.id.tv_apply_send_num, String.valueOf(item.getCanOutStoreProductSum()));
-        helper.setText(R.id.tv_send_num, String.format("发货数量：%s",String.valueOf(item.getShipSum())));
+        helper.setText(R.id.tv_num,MathUtils.converData(item.getProductCount(),3));
+        helper.setText(R.id.tv_apply_send_num,MathUtils.converData(item.getCanOutStoreProductSum(),3));
+        helper.setText(R.id.tv_send_num, String.format("发货数量：%s",MathUtils.converData(item.getShipSum(),3)));
         AddAndReduceView nrcNum = helper.getView(R.id.arv_num);
-        nrcNum.setMaxNum(item.getStoreSum());
+        nrcNum.setMaxNum(item.getCanOutStoreProductSum());
         nrcNum.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {
             @Override
             public void OnNumberChanged(String vs) {

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

@@ -5,7 +5,9 @@ import android.os.Bundle;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkBaseFg;
+import com.wd.workoffice.ui.activity.mes.MesLoginActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
+import com.wd.workoffice.util.UserKeeper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,6 +63,26 @@ public class MsgFragment extends WorkBaseFg {
 
     @Override
     protected void initEvent() {
+        vpData.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int i, float v, int i1) {
+//                if (!UserKeeper.getInstance().getMesLogin()) {
+//                    startActivity(MesLoginActivity.class);
+//                }
+            }
+
+            @Override
+            public void onPageSelected(int i) {
+                if (!UserKeeper.getInstance().getMesLogin() && i == 1) {
+                    startActivity(MesLoginActivity.class);
+                }
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int i) {
+
+            }
+        });
     }
 
     @Override