1.添加仓库参数

2.去除接单方式

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

@@ -261,7 +261,7 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
                         || TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
                     if (TextUtils.isEmpty(usedStore)) {
                         startActivityForResult(ChooseStockActivity.class, 10001,
-                                "siteType", "OUT", "customerId", getIntent().getStringExtra("customerId"));
+                                "sign", "USED","siteType", "OUT", "customerId", getIntent().getStringExtra("customerId"));
                     }
                 }
                 break;

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

@@ -247,7 +247,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                     toast("请选择客户");
                     return;
                 }
-                startActivityForResult(ChooseStockActivity.class, 10005, "siteType", "OUT"
+                startActivityForResult(ChooseStockActivity.class, 10005, "sign", "SEND","siteType", "OUT"
                         , "customerId", clientId.toString());
                 break;
             case R.id.ll_in_stock:

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

@@ -67,7 +67,9 @@ public class ChooseStockActivity extends WorkToolBarActivity {
         param.put("siteType", getIntent().getStringExtra("siteType"));
         if (!TextUtils.isEmpty(getIntent().getStringExtra("customerId")))
             param.put("customerId", getIntent().getStringExtra("customerId"));
-        param.put("sign", "");
+        if (!TextUtils.isEmpty(getIntent().getStringExtra("sign")))
+            param.put("sign", getIntent().getStringExtra("sign"));
+//        param.put("sign", "");
         getData();
     }
 

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

@@ -286,7 +286,7 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
             data.put("outerPrice", recordsBean.getCarPrice());
             data.put("productCount", recordsBean.getCarNum());
             data.put("annex", recordsBean.getUrl());
-            data.put("provideMethod", recordsBean.getProvideMethod());
+//            data.put("provideMethod", recordsBean.getProvideMethod());
             orderItems.add(data);
         }
         return orderItems;

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

@@ -49,11 +49,11 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
         helper.setText(R.id.tv_unit, item.getProductUnit());
         helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
         helper.setText(R.id.tv_num, MathUtils.converData(item.getProductCount(), 3));
-        helper.setGone(R.id.rl_receive_order,true);
-//        {"接单方生产", "接单方采购"};
-        if (!TextUtils.isEmpty(item.getProvideMethod())){
-            helper.setText(R.id.tv_receive_order, TextUtils.equals(item.getProvideMethod(),"1")?"接单方生产":"接单方采购");
-        }
+//        helper.setGone(R.id.rl_receive_order,true);
+////        {"接单方生产", "接单方采购"};
+//        if (!TextUtils.isEmpty(item.getProvideMethod())){
+//            helper.setText(R.id.tv_receive_order, TextUtils.equals(item.getProvideMethod(),"1")?"接单方生产":"接单方采购");
+//        }
         if (!TextUtils.isEmpty(item.getAnnex())) {
             helper.setText(R.id.tv_annex,"附件");
 //            helper.setText(R.id.tv_annex, item.getAnnex().substring(1));

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

@@ -80,11 +80,11 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
                 helper.setGone(R.id.rl_choose_dep, false);
                 helper.setGone(R.id.rl_sale_price, false);
             }
-            //供应和销售显示接单方式
+            //供应和销售显示接单方式  (修改为全部隐藏)
             if (TextUtils.equals(orderType,
                     PermissionType.PROCESS_SALE.getCode()) || TextUtils.equals(orderType,
                     PermissionType.PROCESS_SUPPLY.getCode())) {
-                helper.setGone(R.id.rl_receive_order, true);
+                helper.setGone(R.id.rl_receive_order, false);
             } else {
                 helper.setGone(R.id.rl_receive_order, false);
             }

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

@@ -40,11 +40,11 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet
         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.setGone(R.id.rl_receive_order,true);
-//        {"接单方生产", "接单方采购"};
-        if (!TextUtils.isEmpty(item.getProvideMethod())){
-            helper.setText(R.id.tv_receive_order, TextUtils.equals(item.getProvideMethod(),"1")?"接单方生产":"接单方采购");
-        }
+//        helper.setGone(R.id.rl_receive_order,true);
+////        {"接单方生产", "接单方采购"};
+//        if (!TextUtils.isEmpty(item.getProvideMethod())){
+//            helper.setText(R.id.tv_receive_order, TextUtils.equals(item.getProvideMethod(),"1")?"接单方生产":"接单方采购");
+//        }
         if (!TextUtils.isEmpty(item.getAnnex())){
             helper.setText(R.id.tv_annex,"附件");
 //            helper.setText(R.id.tv_annex,item.getAnnex().substring(1));