1.现场库，未结算库

2.//TODO erp用户激活测试，忘记/重置密码测试，坩埚下单页面，组装下单，产品下单还差附件测试，mes，消息，刷新token

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsDetailActivity.java

@@ -82,14 +82,13 @@ public class WorkContactsDetailActivity extends WorkToolBarActivity {
                     startActivity(WorkContactsMoneyActivity.class, "type","3","id", getIntent().getStringExtra("id"));
                 }else {
                     startActivity(WorkContactsMoneyActivity.class, "type","2","id", getIntent().getStringExtra("id"));
-
                 }
                 break;
             case R.id.ll_live:
-                startActivity(WorkContactsLiveStockActivity.class, "id", getIntent().getStringExtra("id"));
+                startActivity(WorkContactsLiveStockActivity.class, "title","现场库","sign","SEND","id", getIntent().getStringExtra("id"));
                 break;
             case R.id.ll_settle:
-                startActivity(WorkContactsLiveStockActivity.class, "id", getIntent().getStringExtra("id"));
+                startActivity(WorkContactsLiveStockActivity.class, "title","未结算库","sign","USED","id", getIntent().getStringExtra("id"));
                 break;
             case R.id.ll_receive_ticket:
                 startActivity(WorkContactsReceiveTicketActivity.class, "id", getIntent().getStringExtra("id"));

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsLiveStockActivity.java

@@ -11,11 +11,13 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.ProPriceBean;
+import com.wd.workoffice.bean.StockBean;
 import com.wd.workoffice.bean.WarehoustBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.WorkLiveStockAdapter;
 import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
+import com.wd.workoffice.util.UserKeeper;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
@@ -55,18 +57,21 @@ public class WorkContactsLiveStockActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        setTitle(getIntent().getStringExtra("title"));
         dataList = new ArrayList<>();
         dataAdapter = new WorkLiveStockAdapter(R.layout.item_live_sotck, dataList);
         dataAdapter.bindToRecyclerView(rvData);
         dataAdapter.setEmptyView(R.layout.view_empty_content,rvData);
         param = WorkUtils.pageKey();
-        param.put("productId", getIntent().getStringExtra("id"));
+        param.put("customerId", getIntent().getStringExtra("id"));
+        param.put("deptId", UserKeeper.getInstance().getUserDepId());
+        param.put("sign", getIntent().getStringExtra("sign"));
         param.put("current", page);
         getData();
     }
 
     private void getData() {
-        RtfUtils.getRtf().getWarehouse(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getRtf().getStock(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -84,24 +89,26 @@ public class WorkContactsLiveStockActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
-                List<WarehoustBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), WarehoustBean.class).getRecords();
-
-                if (page == 1) {
-                    srlRefresh.finishRefresh();
+                List<WarehoustBean.RecordsBean> getList = JSON.parseArray(data.getData().toString(), WarehoustBean.RecordsBean.class);
                 dataList.clear();
                 dataList.addAll(getList);
                 dataAdapter.notifyDataSetChanged();
-                    dataAdapter.loadMoreComplete();
-                } else {
-                    dataAdapter.loadMoreComplete();
-                    dataList.addAll(getList);
-                    dataAdapter.notifyDataSetChanged();
-                }
-                if (getList.size() == 0) {
-                    dataAdapter.loadMoreEnd();
-                } else {
-                    page++;
-                }
+//                if (page == 1) {
+//                    srlRefresh.finishRefresh();
+//                    dataList.clear();
+//                    dataList.addAll(getList);
+//                    dataAdapter.notifyDataSetChanged();
+//                    dataAdapter.loadMoreComplete();
+//                } else {
+//                    dataAdapter.loadMoreComplete();
+//                    dataList.addAll(getList);
+//                    dataAdapter.notifyDataSetChanged();
+//                }
+//                if (getList.size() == 0) {
+//                    dataAdapter.loadMoreEnd();
+//                } else {
+//                    page++;
+//                }
             }
         });
     }
@@ -117,13 +124,13 @@ public class WorkContactsLiveStockActivity extends WorkToolBarActivity {
                 getData();
             }
         });
-        dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
-            @Override
-            public void onLoadMoreRequested() {
-                param.put("current", page);
-                getData();
-            }
-        }, rvData);
+//        dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+//            @Override
+//            public void onLoadMoreRequested() {
+//                param.put("current", page);
+//                getData();
+//            }
+//        }, rvData);
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {