1.修改审核提交，备注是否需要填写规则

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

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

@@ -130,28 +130,13 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
+                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
                     toast("请填写备注");
                     return;
                 }

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

@@ -122,28 +122,13 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }

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

@@ -144,28 +144,13 @@ public class QualityApplyDetailActivity extends WorkToolBarActivity {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
+                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
                     toast("请填写备注");
                     return;
                 }

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

@@ -343,7 +343,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
+                if (status!=1 && TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
                     toast("请填写备注");
                     return;
                 }

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

@@ -191,28 +191,13 @@ public class SendApplyDetailActivity extends WorkToolBarActivity {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }

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

@@ -139,28 +139,13 @@ public class UseApplyDetailActivity extends WorkToolBarActivity {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }

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

@@ -168,28 +168,13 @@ public class StoreFinancialDetailActivity extends WorkToolBarActivity {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status != 1&&TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialPayActivity.java

@@ -199,28 +199,13 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialReceiveTicketDetailActivity.java

@@ -157,28 +157,13 @@ public class WorkFinancialReceiveTicketDetailActivity extends WorkToolBarActivit
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkLogisticsDetailActivity.java

@@ -177,28 +177,13 @@ public class WorkLogisticsDetailActivity extends WorkToolBarActivity {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status!=1 &&TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkProSearchActivity.java

@@ -210,6 +210,7 @@ public class WorkProSearchActivity extends WorkBaseActivity implements WorkProCo
         TextView tvOk = view.findViewById(R.id.tv_ok);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etPrice = view.findViewById(R.id.et_price);
+        WorkUtils.addDecimalsListener(etPrice);
         EditText etRemark = view.findViewById(R.id.et_remark);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();

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

@@ -213,28 +213,13 @@ public class AddStockApplyFragment extends WorkBaseFg {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
+                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
                     toast("请填写备注");
                     return;
                 }

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

@@ -180,28 +180,13 @@ public class MesOrderFragment extends WorkBaseFg {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }

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

@@ -193,28 +193,13 @@ public class QualityApplyFragment extends WorkBaseFg {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
+                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
                     toast("请填写备注");
                     return;
                 }

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

@@ -44,6 +44,7 @@ import io.reactivex.disposables.Disposable;
 
 
 /**
+ * 发货申请列表
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -85,13 +86,13 @@ public class SendApplyFragment extends WorkBaseFg {
     }
 
     private void changePermission() {
-        boolean hasPermission =true;
+        boolean hasPermission = true;
         if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
-            hasPermission =WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
+            hasPermission = WorkUtils.hasPermission(PagePermissionType.SO_OUT_AUDIT.getPermission());
         } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
-            hasPermission =WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getPermission());
+            hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_OUT_AUDIT.getPermission());
         } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
-            hasPermission =WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getPermission());
+            hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_OUT_AUDIT.getPermission());
         }
         dataAdapter.setHasPermission(hasPermission);
         dataAdapter.notifyDataSetChanged();
@@ -203,28 +204,13 @@ public class SendApplyFragment extends WorkBaseFg {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }

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

@@ -44,6 +44,7 @@ import io.reactivex.disposables.Disposable;
 
 
 /**
+ * 领用列表
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -208,28 +209,13 @@ public class UseApplyFragment extends WorkBaseFg {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        etRemark.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                tvNum.setText(s.length() + "/140");
-            }
-        });
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                if (status != 1&&TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }