1.修改下单逻辑

2.//todo  回款管理的客户接口

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

@@ -270,7 +270,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                                 return super.onOptionsItemSelected(item);
                             }
                             if (chooseSendStock == null) {
-                                toast("请选择出库仓库");
+                                toast("请选择发货仓库");
                                 return super.onOptionsItemSelected(item);
                             }
                             break;
@@ -288,7 +288,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                                 return super.onOptionsItemSelected(item);
                             }
                             if (chooseSendStock == null) {
-                                toast("请选择出库仓库");
+                                toast("请选择发货仓库");
                                 return super.onOptionsItemSelected(item);
                             }
                             break;
@@ -340,7 +340,7 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
     }
 
 
-    @OnClick({R.id.ll_send_stock,R.id.ll_in_stock,R.id.ll_client, R.id.ll_supplier, R.id.btn_search, R.id.ll_common})
+    @OnClick({R.id.ll_send_stock, R.id.ll_in_stock, R.id.ll_client, R.id.ll_supplier, R.id.btn_search, R.id.ll_common})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.ll_send_stock:
@@ -348,16 +348,16 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                     toast("请选择客户");
                     return;
                 }
-                startActivityForResult(ChooseStockActivity.class, 10005,"siteType","OUT"
-                ,"customerId",clientId.toString());
+                startActivityForResult(ChooseStockActivity.class, 10005, "siteType", "OUT"
+                        , "customerId", clientId.toString());
                 break;
             case R.id.ll_in_stock:
 //                if (clientId == null) {
 //                    toast("请选择客户");
 //                    return;
 //                }
-                startActivityForResult(ChooseStockActivity.class, 10004,"siteType","IN"
-                       );
+                startActivityForResult(ChooseStockActivity.class, 10004, "siteType", "IN"
+                );
                 break;
             case R.id.ll_client:
                 switch (type) {
@@ -507,14 +507,18 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                     switch (type) {
                         case "1":
                             param.put("transitPartId", clientId);
-                            tvCommonContent.setText("");
+                            chooseSendStock = null;
+                            tvSendStockContent.setText("");
 //                            batChooseInfoPresenter.getProcess(permissionCode, clientId);
                             page = 1;
                             param.put("current", 1);
+                            carList.clear();
                             batChooseInfoPresenter.getPro(param);
                             break;
                         case "2":
                             tvCommonContent.setText("");
+                            chooseSendStock = null;
+                            tvSendStockContent.setText("");
 //                            batChooseInfoPresenter.getProcess(permissionCode, clientId);
                             break;
                         case "3":
@@ -541,10 +545,12 @@ public class ChooseInfoActivity extends WorkToolBarActivity implements BatChoose
                             param.put("transitPartId", supplyId);
                             page = 1;
                             param.put("current", 1);
+                            carList.clear();
                             batChooseInfoPresenter.getPro(param);
                             break;
                         case "3":
                             param.put("transitPartId", supplyId);
+                            carList.clear();
                             page = 1;
                             param.put("current", 1);
                             batChooseInfoPresenter.getPro(param);

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

 package com.wd.workoffice.ui.activity.bat.store;
 
 import android.content.Intent;
+import android.text.TextUtils;
 import android.view.View;
 
 import com.alibaba.fastjson.JSON;
@@ -64,8 +65,9 @@ public class ChooseStockActivity extends WorkToolBarActivity {
         param = WorkUtils.simpleParam();
         param.put("deptId", UserKeeper.getInstance().getUserDepId());
         param.put("siteType", getIntent().getStringExtra("siteType"));
-        param.put("customerId", getIntent().getStringExtra("customerId"));
-        param.put("sign","");
+        if (!TextUtils.isEmpty(getIntent().getStringExtra("customerId")))
+            param.put("customerId", getIntent().getStringExtra("customerId"));
+        param.put("sign", "");
         getData();
     }
 

app/src/main/res/layout/activity_main_choose_info.xml

@@ -72,7 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="right"
-            android:text="请选择入库仓库"
+            android:hint="请选择入库仓库"
             android:textColor="#FF5E6D82"
             android:textSize="16sp" />
 
@@ -104,7 +104,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="right"
-            android:text="请选择发货仓库"
+            android:hint="请选择发货仓库"
             android:textColor="#FF5E6D82"
             android:textSize="16sp" />