1.添加发货申请订单状态限制

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

app/src/main/java/com/wd/workoffice/ui/activity/bat/approval/ApprovalFromMeActivity.java

@@ -76,21 +76,21 @@ public class ApprovalFromMeActivity extends WorkToolBarActivity {
         return R.layout.activity_order;
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_add, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.add:
-                startActivity(SendApplyAddActivity.class,
-                        "orderType", getIntent().getStringExtra("orderType"),
-                        "id", getIntent().getStringExtra("orderId"));
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.menu_add, menu);
+//        return super.onCreateOptionsMenu(menu);
+//    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        switch (item.getItemId()) {
+//            case R.id.add:
+//                startActivity(SendApplyAddActivity.class,
+//                        "orderType", getIntent().getStringExtra("orderType"),
+//                        "id", getIntent().getStringExtra("orderId"));
+//                break;
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/approval/ApprovalToMeActivity.java

@@ -74,21 +74,21 @@ public class ApprovalToMeActivity extends WorkToolBarActivity {
         return R.layout.activity_order;
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_add, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.add:
-                startActivity(SendApplyAddActivity.class,
-                        "orderType", getIntent().getStringExtra("orderType"),
-                        "id", getIntent().getStringExtra("orderId"));
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.menu_add, menu);
+//        return super.onCreateOptionsMenu(menu);
+//    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        switch (item.getItemId()) {
+//            case R.id.add:
+//                startActivity(SendApplyAddActivity.class,
+//                        "orderType", getIntent().getStringExtra("orderType"),
+//                        "id", getIntent().getStringExtra("orderId"));
+//                break;
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
 }

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

@@ -356,6 +356,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
                     return;
                 }
                 startActivity(AddCrucibleActivity.class,
+                        "status", dataBean.getStatus() + "",
                         "pro",JSON.toJSONString(dataBean.getOrderItems()),
                         "orderId", getIntent().getStringExtra("id"));
                 break;
@@ -365,6 +366,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
                     return;
                 }
                 startActivity(SendApplyActivity.class,
+                        "status", dataBean.getStatus() + "",
                         "orderType", dataBean.getExpandInfo().getOrderType(),
                         "orderId", getIntent().getStringExtra("id"));
                 break;

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

@@ -316,6 +316,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
                     return;
                 }
                 startActivity(EndApplyActivity.class,
+                        "status", dataBean.getStatus() + "",
                         "status", getIntent().getStringExtra("status"),
                         "orderType", dataBean.getExpandInfo().getOrderType(),
                         "orderId", getIntent().getStringExtra("id"));
@@ -326,6 +327,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
                     return;
                 }
                 startActivity(SendApplyActivity.class,
+                        "status", dataBean.getStatus() + "",
                         "orderType", dataBean.getExpandInfo().getOrderType(),
                         "orderId", getIntent().getStringExtra("id"));
                 break;

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

@@ -372,6 +372,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
                     return;
                 }
                 startActivity(SendApplyActivity.class,
+                        "status", dataBean.getStatus() + "",
                         "orderType", dataBean.getExpandInfo().getOrderType(),
                         "orderId", getIntent().getStringExtra("id"));
                 break;

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

@@ -341,6 +341,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
                     return;
                 }
                 startActivity(SendApplyActivity.class,
+                        "status", dataBean.getStatus() + "",
                         "orderType", dataBean.getExpandInfo().getOrderType(),
                         "orderId", getIntent().getStringExtra("id"));
                 break;

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

@@ -79,18 +79,20 @@ public class SendApplyActivity extends WorkToolBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        String orderType = getIntent().getStringExtra("orderType");
-        if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
-            if (WorkUtils.hasPermission(PagePermissionType.SO_OUT_SAVE.getPermission())) {
-                getMenuInflater().inflate(R.menu.menu_add, menu);
-            }
-        } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
-            if (WorkUtils.hasPermission(PagePermissionType.PO_OUT_SAVE.getPermission())) {
-                getMenuInflater().inflate(R.menu.menu_add, menu);
-            }
-        } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
-            if (WorkUtils.hasPermission(PagePermissionType.CO_OUT_SAVE.getPermission())) {
-                getMenuInflater().inflate(R.menu.menu_add, menu);
+        if (!TextUtils.equals("status", getIntent().getStringExtra("600"))) {
+            String orderType = getIntent().getStringExtra("orderType");
+            if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+                if (WorkUtils.hasPermission(PagePermissionType.SO_OUT_SAVE.getPermission())) {
+                    getMenuInflater().inflate(R.menu.menu_add, menu);
+                }
+            } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
+                if (WorkUtils.hasPermission(PagePermissionType.PO_OUT_SAVE.getPermission())) {
+                    getMenuInflater().inflate(R.menu.menu_add, menu);
+                }
+            } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
+                if (WorkUtils.hasPermission(PagePermissionType.CO_OUT_SAVE.getPermission())) {
+                    getMenuInflater().inflate(R.menu.menu_add, menu);
+                }
             }
         }
         return super.onCreateOptionsMenu(menu);

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

@@ -88,6 +88,7 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
     protected void initView() {
         ButterKnife.bind(this);
         rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        WorkUtils.addNumListener(etRemark, tvInput1);
     }
 
     @Override

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

@@ -343,6 +343,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
                     return;
                 }
                 startActivity(SendApplyActivity.class,
+                        "status", dataBean.getStatus() + "",
                         "orderType", dataBean.getExpandInfo().getOrderType(),
                         "orderId", getIntent().getStringExtra("id"));
                 break;

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

@@ -49,7 +49,7 @@ public class WorkSendApplyAddAdapter extends BaseQuickAdapter<OrderDetail.OrderI
 //        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.getStoreSum()));
-        helper.setText(R.id.tv_send_num, "发货数量："+String.valueOf(item.getUsedSum()));
+        helper.setText(R.id.tv_send_num, String.format("发货数量：%s",String.valueOf(item.getShipSum())));
         AddAndReduceView nrcNum = helper.getView(R.id.arv_num);
         nrcNum.setMaxNum(item.getStoreSum());
         nrcNum.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {