1.添加验证

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，编辑任务担当无法修改.支数参数
token刷新问题

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

@@ -166,8 +166,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
         param = WorkUtils.pageKey();
         param.put("current", 1);
         param.put("processType", permissionCode);
-        param.put("outDeptId", getIntent().getStringExtra("deptId"));
-        param.put("deptId", getIntent().getStringExtra("deptId"));//内部交易
+        param.put("outDeptId",getIntent().getStringExtra("deptId"));
         stockParam = WorkUtils.simpleParam();
         stockParam.put("deptId", UserKeeper.getInstance().getUserDepId());
         if (TextUtils.equals("3", type)) {
@@ -175,6 +174,8 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
             batChooseInfoPresenter.getStock(stockParam);
         }
         if (TextUtils.equals("5", type)) {
+            param.put("deptId", getIntent().getStringExtra("deptId"));//内部交易
+            batChooseInfoPresenter.getPro(param);
             batChooseInfoPresenter.getStock(stockParam);
         }
         if (TextUtils.equals("6", type)) {
@@ -222,10 +223,11 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                     }
                     startActivity(StoreTradingCarActivity.class,
                             "pro", JSON.toJSONString(carMap),
-                            "supplierId", "",
-                            "subProcess", "",
-                            "inStockId", chooseStock.getId() + "",
-                            "customerId", "",
+                            "supplierId", supplyId==null?"":supplyId.toString(),
+                            "subProcess", chooseProcess==null?"":chooseProcess.getName(),
+                            "subProcessId",  chooseProcess==null?"":chooseProcess.getId() + "",
+                            "inStockId", chooseStock==null?"":chooseStock.getId() + "",
+                            "customerId", clientId==null?"":clientId.toString(),
                             "receiveDeptId", getIntent().getStringExtra("deptId"),
                             "code", permissionCode);
                 } else {
@@ -285,12 +287,12 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                     }
                     startActivity(StoreSaleCarActivity.class,
                             "pro", JSON.toJSONString(carList),
-                            "supplierId", supplyId.toString(),
-                            "subProcess", chooseProcess.getName(),
-                            "subProcessId", chooseProcess.getId() + "",
+                            "supplierId", supplyId==null?"":supplyId.toString(),
+                            "subProcess", chooseProcess==null?"":chooseProcess.getName(),
+                            "subProcessId",  chooseProcess==null?"":chooseProcess.getId() + "",
 
-                            "inStockId", chooseStock.getId() + "",
-                            "customerId", clientId.toString(),
+                            "inStockId", chooseStock==null?"":chooseStock.getId() + "",
+                            "customerId", clientId==null?"":clientId.toString(),
                             "receiveDeptId", getIntent().getStringExtra("deptId"),
                             "code", permissionCode);
                 }
@@ -350,10 +352,20 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                 }
                 break;
             case R.id.btn_search:
+                switch (type) {
+                    case "1":
                         if (clientId == null) {
                             toast("请选择用户");
                             return;
                         }
+                        break;
+                    case "2":
+                        if (clientId == null) {
+                            toast("请选择用户");
+                            return;
+                        }
+                        break;
+                }
                 param.put("name", etKey.getText().toString());
                 param.put("current", 1);
                 page = 1;