1.坩埚订单修改

2.入库文案修改

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

@@ -114,7 +114,7 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
                 List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
                 for (OrderDetail.OrderItemsBean orderItem : orderItems) {
                  if (TextUtils.equals(orderItem.getId(),getIntent().getStringExtra("orderItemId"))) {
-                     tvNum.setText(String.format("入库数量(%s)", MathUtils.converData(orderItem.getCanInStoreProductSum(),3)));
+                     tvNum.setText(String.format("入库数量(最大入库数量%s)", MathUtils.converData(orderItem.getCanInStoreProductSum(),3)));
                  }
                 }
             }

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

@@ -52,6 +52,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
     private int page = 1;
     private SaleCruibleAdapter saleAdapter;
     private ProCruibleAdapter proAdapter;
+    private String type;
 
     @Override
     protected void initView() {
@@ -74,8 +75,9 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
     @Override
     protected void initData() {
         identity = getIntent().getStringExtra("identity");
+        type = getIntent().getStringExtra("type");
         orderList = new ArrayList<>();
-        if (TextUtils.equals(identity, "1")) {
+        if (TextUtils.equals(type, "1")) {
             etKey.setHint("坩埚销售订单:输入订单号");
             saleAdapter = new SaleCruibleAdapter(R.layout.item_crucible_sale, orderList);
             saleAdapter.bindToRecyclerView(rvData);
@@ -98,7 +100,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
 
     @Override
     protected void initEvent() {
-        if (TextUtils.equals(identity, "1")) {
+        if (TextUtils.equals(type, "1")) {
             saleAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
                 @Override
                 public void onLoadMoreRequested() {
@@ -168,7 +170,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
 
     private void getData() {
         Observable<BaseBean> observable;
-        if (TextUtils.equals(identity, "1")) {
+        if (TextUtils.equals(type, "1")) {
             observable = RtfUtils.getRtf().getCucibleSaleOrder(param);
         } else {
             observable = RtfUtils.getRtf().getCucibleOrder(param);
@@ -196,7 +198,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
                 if (page == 1) {
                     orderList.clear();
                     orderList.addAll(dataList);
-                    if (TextUtils.equals(identity, "1")) {
+                    if (TextUtils.equals(type, "1")) {
                         saleAdapter.notifyDataSetChanged();
                         saleAdapter.loadMoreComplete();
                     } else {
@@ -204,7 +206,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
                         proAdapter.loadMoreComplete();
                     }
                 } else {
-                    if (TextUtils.equals(identity, "1")) {
+                    if (TextUtils.equals(type, "1")) {
                         saleAdapter.loadMoreComplete();
                         orderList.addAll(dataList);
                         saleAdapter.notifyDataSetChanged();
@@ -215,7 +217,7 @@ public class CrucibleOrderSearchActivity extends WorkBaseActivity {
                     }
                 }
                 if (dataList.size() == 0) {
-                    if (TextUtils.equals(identity, "1")) {
+                    if (TextUtils.equals(type, "1")) {
                         saleAdapter.loadMoreEnd();
                     } else {
                         proAdapter.loadMoreEnd();

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

@@ -89,7 +89,8 @@ public class SaleCrucibleOrderActivity extends WorkToolBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.search:
-                startActivity(CrucibleOrderSearchActivity.class, "identity", getIntent().getStringExtra("identity"));
+                startActivity(CrucibleOrderSearchActivity.class, "identity", getIntent().getStringExtra("identity")
+                ,"type",vpData.getCurrentItem()+"");
                 break;
         }
         return super.onOptionsItemSelected(item);

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

@@ -68,7 +68,7 @@ public class CrucibleOrderBuyListFragment extends WorkBaseFg {
         param = WorkUtils.pageKey();
         if (!TextUtils.isEmpty(state))
             param.put("status", state);
-        param.put("identity", 1);
+        param.put("identity", identity);
         page = 1;
         param.put("current", page);
         dataList = new ArrayList<>();

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

@@ -66,7 +66,7 @@ public class CrucibleOrderSaleListFragment extends WorkBaseFg {
         param = WorkUtils.pageKey();
         if (!TextUtils.isEmpty(state))
             param.put("status", state);
-        param.put("identity", 1);
+        param.put("identity", identity);
         page = 1;
         param.put("current", page);
         dataList = new ArrayList<>();